Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r734 -r924
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 734)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 924)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:01:07">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-04 10:50:33">
 <Class name="TECH.Error.impl.ErrorHandler">
 <Description>
 Deze class doet de eigenlijke error afhandeling. 
@@ -8,7 +8,7 @@
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62073,53619.239901</TimeChanged>
+<TimeChanged>62154,39102.635211</TimeChanged>
 <TimeCreated>62025,48050.831801</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -30,9 +30,9 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Label:%String,Options:%String</FormalSpec>
 <Implementation><![CDATA[
-		Set %ErrorObject=..GetInfo(.Label)
-		Do:($ZCVT($G(Options),"U")'["NOMAIL") ..MailError(%ErrorObject)
-		Do:($ZCVT($G(Options),"U")'["NOLOG") ..LogError(%ErrorObject)
+	Set %ErrorObject=..GetInfo(.Label)
+	Do:($ZCVT($G(Options),"U")'["NOMAIL") ..MailError(%ErrorObject)
+	Do:($ZCVT($G(Options),"U")'["NOLOG") ..LogError(%ErrorObject)
 ]]></Implementation>
 </Method>
 
@@ -42,8 +42,10 @@
 <Implementation><![CDATA[
 	Set Error=##class(TECH.Error.dto.ErrorInfo).%New()
 	Set Error.Label=$G(Label)
-	Set Error.ErrorCode=$ECode
-	Set Error.ErrorCode2=$ZError
+	Set Error.ErrorCode=$ZERROR
+	Set:Error.ErrorCode["<ECODETRAP>" Error.ErrorCode2=$ECODE
+	;Set $ECODE = "" // $ECODE op leeg zetten anders gaat hij verder den boom in :)
+	
 	Set Error.TrapHandler=$ETrap
 	Set:$G(%objlasterror)'="" Error.ObjectLastError=$$ParseStatus^vhLib(%objlasterror)
 	Set Error.StackTrace=..StackTrace(3)
@@ -92,8 +94,19 @@
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
 <Implementation><![CDATA[
 	Do Error.XMLExportToString(.Info,,"literal,indent")
-
+	
+	if $Data(%vhLastError) {
+		set LastErrorInfo = ##class(%GlobalCharacterStream).%New()
+		do LastErrorInfo.WriteLine(%vhLastError.%ClassName(1))
+		do %vhLastError.XMLExportToStream(.LastErrorInfo,,"literal,indent")
+		
+	}
 	Set Logger=##class(vhLib.Logger).%New("TECH.Error")
+	
+	if $data(LastErrorInfo) {
+		Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), LastErrorInfo)
+	}
+	
 	Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), Info)
 ]]></Implementation>
 </Method>
@@ -102,30 +115,51 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
 <Implementation><![CDATA[
-	
 	//Quit:($$$UCase(Error.Server)="CACHE02")&&($$$UCase(Error.NameSpace)?1(1"DEV-ADMIN1"))
 	
-	Set Body="Errors:"
-	Set:Error.ErrorCode'="" Body=Body_$$$CRLF_"   $ECODE: "_Error.ErrorCode
-	Set:Error.ErrorCode2'="" Body=Body_$$$CRLF_"   $ZERROR: "_Error.ErrorCode2
-	Set:Error.ObjectLastError'="" Body=Body_$$$CRLF_"   ObjectLastError: "_Error.ObjectLastError
-	Set Body=Body_$$$CRLF_$$$CRLF_"TrapHandler: "_Error.TrapHandler
-	Set Body=Body_$$$CRLF_"Stack: "_Error.StackTrace
-	Set Body=Body_$$$CRLF
-	Set Body=Body_$$$CRLF_"RemoteIP: "_Error.RemoteIP
-	Set Body=Body_$$$CRLF
-	Set Body=Body_$$$CRLF_"Device: "_Error.Device_"  Job: "_Error.Job
-	Set Body=Body_$$$CRLF_"Server: "_Error.Server_"  NameSpace: "_Error.NameSpace
+	set Body = ##class(%GlobalCharacterStream).%New()
+	
+	do Body.WriteLine("Errors:")
+	if Error.ErrorCode'="" do Body.WriteLine("   $ZERROR: "_Error.ErrorCode)
+	if Error.ErrorCode2'="" do Body.WriteLine("   $ECODE: "_Error.ErrorCode2)
+	
+	if Error.ObjectLastError'="" do Body.WriteLine("   ObjectLastError: "_Error.ObjectLastError)
+
+	do Body.WriteLine()
+	do Body.WriteLine("TrapHandler: "_Error.TrapHandler)
+	do Body.WriteLine("Stack: "_Error.StackTrace)
+	do Body.WriteLine()
+	do Body.WriteLine("RemoteIP: "_Error.RemoteIP)
+	do Body.WriteLine()
+	do Body.WriteLine("Device: "_Error.Device_"  Job: "_Error.Job)
+	do Body.WriteLine("Server: "_Error.Server_"  NameSpace: "_Error.NameSpace)
+	do Body.WriteLine()
+	do Body.WriteLine("Variabelen : ")
+	
+	set Var = "%" 
+	for  { set Var = $order(@Var) quit:Var=""  
+		 ;continue:Var="%vhLastError"
+		 ;continue:Var="%ErrorObject"
+		 ;continue:Var="%this"
+		
+		do Body.WriteLine(Var_" : "_@Var)
+		if $IsObject(@Var) { 
+		 	//do Body.WriteLine($$ObjToText^vhLib(@Var)) 
+		}
+	}
+	
 	Set From=$$$SystemMail("TECH ErrorHandler")
 	
-	Set Subj="TECH - ErrorHandler : "_Error.Label_" : "_Error.ErrorCode
 	
+	Set Subj="TECH - ErrorHandler : " _
+		$select($length(Error.Label):Error.Label_" : ",1:"") _ Error.ErrorCode _
+		$select($length(Error.ErrorCode2):" | "_Error.ErrorCode2,1:"")
+	
 	Set To = $listbuild(..GetMailAddress(Error))
 	
-	Set sc=$$SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
+	Set sc=$$SendMiniMail^vhLib(From,To,Subj,Body,1,,,,)
 	
-	If $$$ISERR(sc)
-	{
+	If $$$ISERR(sc) {
 		Do ..CrashDuringErrorHandling(sc)
 	}
 	Quit
@@ -156,7 +190,7 @@
 	Set Body="Bij het versturen van de errormail heeft zich een fout voorgedaan waardoor de mail niet kon verstuurd worden"
 	Set:$G(sc) Body=Body_$$$CRLF_$$ParseStatus^vhLib(sc)
 	Set Subj="TECH - ErrorHandler : Crash during error handling"
-	Set To=$LB($$$IctSysOp)
+	Set To=$listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress"))
 	Set sc=$$SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
 ]]></Implementation>
 </Method>
@@ -171,5 +205,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="843598278"/>
+<Checksum value="3266019473"/>
 </Export>