Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u -r1936 -r1969
--- TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1936)
+++ TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1969)
@@ -5,6 +5,21 @@
 <Super>TECH.IException,%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Parameter name="OverbodigeVariabelen1">
+<Type>%String</Type>
+<Default>$ZU(  5);$ZU( 12);$ZU( 18);$ZU( 20);$ZU( 23,1);$ZU( 34);$ZU( 39);$ZU( 55);$ZU( 56,0);$ZU( 56,1);$ZU( 67,10,$J);$ZU( 67,11,$J);$ZU( 67,12,$J);$ZU( 67,13,$J);$ZU( 67,14,$J);$ZU( 67,15,$J);$ZU( 67,4,$J);$ZU( 67,5,$J);$ZU( 67,7,$J);$ZU( 67,8,$J);$ZU( 67,9,$J);$ZU( 68,1);$ZU( 68,21);$ZU( 68,25);$ZU( 68,27);$ZU( 68,32);$ZU( 68,34);$ZU( 68,36);$ZU( 68,38);$ZU( 68,40);$ZU( 68,41);$ZU( 68,43);$ZU( 68,5);$ZU( 68,6);$ZU( 68,7);$ZU(131,0);$ZV;Error;Lev;Routine</Default>
+</Parameter>
+
+<Parameter name="OverbodigeVariabelen2">
+<Type>%String</Type>
+<Default>F;F0;F1;F2;F3;F4;F5;F6;F7;F8;F9;F11;F12;F55;F56;F57;F58;F60;F61;F62;F70;F71;F90;F91;F92;F93;F94;F95;FDL;FIN;FP;FG;F80;F81;F82;F83;F84;F85;F86;F87;F88;F89;F96;F97;F30;F31;F32;F33;F100;F101;F102;F103;F103;F110;F111;F120;F121;F122;F123;F124;F125;F;F0;F1;F11;F12;F2;F3;F4;F420;F5;F55;F56;F57;F58;F6;F60;F61;F62;F7;F70;F71;F8;F9;F90;F91;F92;F93;F94;F95;FCH;FCS;FDL;FE;FG;FIN;FLO;FMTB;FMTCL;FMTI;FMTK;FMTU;FMTb;FMTi;FMTk;FMTu;FR;FS;FS132;FS80;FSC;FUP</Default>
+</Parameter>
+
+<Parameter name="TekstGeenInfo">
+<Type>%String</Type>
+<Default>Geen extra info aanwezig.</Default>
+</Parameter>
+
 <Property name="InnerException">
 <Type>TECH.IException</Type>
 <Private>1</Private>
@@ -28,13 +43,12 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set ..ErrorID = $$LOG^%ETN()
-	Set ..Stack = ..StackTrace(2)
+	Set ..ErrorID = $$LOG^%ETN()
+	Set ..Stack = ..StackTrace(1)
 	Set ..Tijdstip = ##class(TECH.DateTime).CurrentTimeStamp()
 	Quit $$$OK
 ]]></Implementation>
@@ -49,18 +63,28 @@
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Tekst = "Tijdstip: "_..Tijdstip_$C(13,10)	 
-	Set Tekst = Tekst _"Stack: "_$C(13,10)_..Stack
-	  
+	Set Tekst = ""
+	Set Tekst = Tekst_"Omschrijving: "_$C(9)_..GeefOmschrijving()_$C(13,10)
+	Set Tekst = Tekst_"ErrorCode: "_$C(9)_..GeefExceptionCode()_$C(13,10)
+	Set Tekst = Tekst_"Tijdstip: "_$C(9)_..GeefTijdstip()_$C(13,10)	 
+	
 	If $IsObject(..InnerException){ 
-	 	Set Tekst = Tekst_$C(13,10)_$C(13,10)_"** InnerException **"_$C(13,10)_ ..InnerException.ToString()
-	  }
-	  
-	  Set Tekst = Tekst_$C(13,10)_..GeefErrorInformatie()
-	  Quit Tekst
+	 	Set Tekst = Tekst_$C(13,10)_$C(13,10)_"** InnerException **"_$C(13,10)_"------------------"_$C(13,10)_ ..InnerException.ToString()
+	}Else{
+		Set Tekst = Tekst_"GebruikerInitialen: "_$C(9)_##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()_$C(13,10)	 
+		Set Tekst = Tekst_"ComputerNaam:"_$C(9)_##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()_$C(13,10)_$C(13,10)	 
+		Set Tekst = Tekst _"Stack: "_$C(13,10)_"------------------"_$C(13,10)_..Stack
+	}
+	Quit Tekst
 ]]></Implementation>
 </Method>
 
+<Method name="GeefInnerException">
+<ReturnType>TECH.IException</ReturnType>
+<Implementation><![CDATA[	Quit ..InnerException
+]]></Implementation>
+</Method>
+
 <Method name="GeefStack">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Stack
@@ -87,44 +111,78 @@
 </Method>
 
 <Method name="GeefErrorInformatie">
-<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	set ErrorInfo = ""
-	if $listlength(..ErrorID) {
-		set Datum = $listget(..ErrorID,1)
-		set Error = $listget(..ErrorID,2)
-		if $length(Datum) && $length(Error) {
-			set StackLevel = ""
-			set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
-			while(StackLevel '= ""){
-				Set ErrorInfo = ErrorInfo_$C(10,13)_StackLevel
-				Set InfoType = ""
-				Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
-				While(InfoType '= ""){
-					Set ErrorInfo = ErrorInfo_$C(9)_InfoType_" : "
-					Set Key = ""
-					Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
-					If (Key = ""){
-						Set ErrorInfo = ErrorInfo_$C(9)_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
-						Set ErrorInfo = ErrorInfo_$C(10,13)
-					}Else{
-						Set ErrorInfo = ErrorInfo_$C(10,13)
-						While(Key '= ""){
-							Set ErrorInfo = ErrorInfo_$C(9)_Key
-							Set ErrorInfo = ErrorInfo_$C(9)_" = "_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
-							Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))	
-							Set ErrorInfo = ErrorInfo_$C(10,13)
+	If ($IsObject(..InnerException)){
+		set ErrorInfo = ..InnerException.GeefErrorInformatie()	
+	}
+	If ('$IsObject(..InnerException) || (ErrorInfo [ ..#TekstGeenInfo)){
+		if $listlength(..ErrorID) {
+			set Datum = $listget(..ErrorID,1)
+			set Error = $listget(..ErrorID,2)
+			set ErrorInfo = "ErrorID : "_$C(9)_Datum_","_Error_$C(13,10)
+			if ($length(Datum) && $length(Error)) {
+				set StackLevel = ""
+				set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+				while(StackLevel '= ""){
+					Set ErrorInfo = ErrorInfo_StackLevel
+					Set InfoType = ""
+					Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
+					While(InfoType '= ""){
+						If ((InfoType '= "I") && (InfoType '= "T") && (InfoType '= "S")){
+							Set InfoLabel = InfoType
+							Set:(InfoLabel = "V") InfoLabel = "Variabelen"
+							Set ErrorInfo = ErrorInfo_$C(9)_InfoLabel_" : "
+							Set Key = ""
+							Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
+							If (Key = ""){
+								Set ErrorInfo = ErrorInfo_$C(9)_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))
+								Set ErrorInfo = ErrorInfo_$C(10,13)
+							}Else{
+								Set ErrorInfo = ErrorInfo_$C(10,13)
+								While(Key '= ""){
+									/// Wegfilteren overbodige info
+									If ('..CheckOverbodig(StackLevel, InfoType,Key)){							
+										Set ErrorInfo = ErrorInfo_$C(9)_$C(9)_Key
+										Set ErrorInfo = ErrorInfo_$C(9)_" = "_$Get(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))
+										Set ErrorInfo = ErrorInfo_$C(10,13)
+									}
+									//If (Key = "%this") Set ErrorInfo = ErrorInfo_$$ObjToText^vhLib(Key)_$C(10,13)
+									Set Key = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType,Key))	
+								}
+								
+							}
 						}
-					}
-					Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))			
-				}		
-				Set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+						Set InfoType = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel,InfoType))			
+					}		
+					Set StackLevel = $Order(^ERRORS(Datum,Error,"*STACK",StackLevel))
+				}
 			}
+			else{
+				Set ErrorInfo = ErrorInfo_$C(10,13)_..#TekstGeenInfo
+			}
+		}else{
+			Set ErrorInfo = ErrorInfo_$C(10,13)_..#TekstGeenInfo
 		}
 	}
 	Quit ErrorInfo
 ]]></Implementation>
 </Method>
+
+<Method name="CheckOverbodig">
+<FormalSpec>StackLevel:%Integer,InfoType:%String,Key:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set Overbodig = 0
+	If (..#OverbodigeVariabelen1 [ Key )
+	{
+		Set Overbodig = 1	
+	}ElseIf (..#OverbodigeVariabelen2 [ Key )
+	{
+		Set Overbodig = 1	
+	}
+	Quit Overbodig
+]]></Implementation>
+</Method>
 </Class>
 </Export>