Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r1946 -r1969
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1946)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1969)
@@ -14,8 +14,6 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Label:%String,Options:%String</FormalSpec>
 <Implementation><![CDATA[
-	/// Loggen van alle variabelen per stacklevel, moet gejobbed worden of error handeling gaat niet verder.
-	//Do BACK^%ETN
 	
 	Set $ETRAP="Do ##class(TECH.Error.impl.ErrorHandler).CrashDuringErrorHandling()"
 	
@@ -49,26 +47,22 @@
 	Set Error.TrapHandler=$ETrap
 	Set:$G(%objlasterror)'="" Error.ObjectLastError=$$ParseStatus^vhLib(%objlasterror)
 	
-	Set Error.StackTrace=..StackTrace(3)
-	
 	if ( Error.ErrorCode["TECH.ExceptionHandler") && ($data(%Exception)) && ($isObject(%Exception) ) {
 		
 		If %Exception.%Extends("TECH.Exceptions.Exception") {
 			Set Error.StackTrace = %Exception.GeefStack()
 		}Else{
-			Set Error.StackTrace=..StackTrace(4)	
+			Set Error.StackTrace=..StackTrace(1)	
 		}
 		set Error.ErrorCode = $piece(Error.StackTrace," ",6)
 		Set Error.ErrorCode2="`"_%Exception.GeefExceptionCode()_"`"_%Exception.GeefOmschrijving()_"`"
 	}
 	else {
 		if Error.ErrorCode["<ECODETRAP>" { set Error.ErrorCode2=$ECODE }
-		Set Error.StackTrace=..StackTrace(3)
+		Set Error.StackTrace=..StackTrace(1)
 		Set Error.ErrorCode=$ZERROR
 	}
 	
-	//Set Error.ExtraInfo = ..GeefExtraInfo()
-	
 	Set Error.Device=$I
 	Set Error.Job=$J
 	Set Error.Server=$ZU(110)
@@ -117,6 +111,7 @@
 	
 	if $data(%Exception) && $IsObject(%Exception) {
 		Set Info = Info _ $$$CRLF_%Exception.ToString()
+		Set Info = Info _ $$$CRLF_%Exception.GeefErrorInformatie()
 	}
 	Set Logger=##class(vhLib.Logger).%New("TECH.Error")
 	Set Log=Logger.Error($S(Error.Label="":"NoLabel",1:Error.Label), Info)
@@ -127,7 +122,6 @@
 <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 = ##class(%GlobalCharacterStream).%New()
 	
@@ -139,34 +133,26 @@
 
 	do Body.WriteLine()
 	do Body.WriteLine("TrapHandler: "_Error.TrapHandler)
-	do Body.WriteLine("Stack: "_Error.StackTrace)
+	do Body.WriteLine("RemoteIP: "_Error.RemoteIP)
+	do Body.WriteLine("Device: "_Error.Device_"  Job: "_Error.Job)
+	do Body.WriteLine("Server: "_Error.Server_"  NameSpace: "_Error.NameSpace)
 	do Body.WriteLine()
 
 	if $data(%Exception) && $IsObject(%Exception) {
 		do Body.WriteLine("ErrorObjectInfo :")
+		do Body.WriteLine("-----------------")
+		
 		do Body.WriteLine(%Exception.ToString())
 		do Body.WriteLine()
+		do Body.WriteLine(%Exception.GeefErrorInformatie())
+		do Body.WriteLine()
 		Set Error.ErrorCode = %Exception.GeefOmschrijving()
-	}
-
-	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()
+	}else{
+		do Body.WriteLine()	
+		do Body.WriteLine("Stack: "_Error.StackTrace)
+		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")
 	
 	
@@ -224,43 +210,5 @@
 	Quit Txt
 ]]></Implementation>
 </Method>
-
-<Method name="GeefExtraInfo">
-<Description>
-Extra info ophalen over de error, dit uit de ^ERRORS global die wordt ingesteld door de aanroep van ^%ETN</Description>
-<ClassMethod>1</ClassMethod>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set ExtraInfo = "Stack"
-	Set LaatsteErrorId = $Get(^ERRORS(+$Horolog))
-	Set StackLevel = ""
-	Set StackLevel = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel))
-	While(StackLevel '= ""){
-		Set ExtraInfo = ExtraInfo_$C(10,13)_StackLevel
-		Set InfoType = ""
-		Set InfoType = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType))
-		While(InfoType '= ""){
-			Set ExtraInfo = ExtraInfo_$C(9)_InfoType_" : "
-			Set Key = ""
-			Set Key = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType,Key))
-			If (Key = ""){
-				Set ExtraInfo = ExtraInfo_$C(9)_$Get(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType))
-				Set ExtraInfo = ExtraInfo_$C(10,13)
-			}Else{
-				Set ExtraInfo = ExtraInfo_$C(10,13)
-				While(Key '= ""){
-					Set ExtraInfo = ExtraInfo_$C(9)_Key
-					Set ExtraInfo = ExtraInfo_$C(9)_" = "_$Get(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType,Key))
-					Set Key = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType,Key))	
-					Set ExtraInfo = ExtraInfo_$C(10,13)
-				}
-			}
-			Set InfoType = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel,InfoType))			
-		}		
-		Set StackLevel = $Order(^ERRORS(+$Horolog,LaatsteErrorId,"*STACK",StackLevel))
-	}
-	Quit ExtraInfo
-]]></Implementation>
-</Method>
 </Class>
 </Export>