Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r810 -r1425
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 810)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1425)
@@ -42,6 +42,7 @@
 <Method name="GetInfo">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Label:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	
 	Set Error=##class(TECH.Error.dto.ErrorInfo).%New()
@@ -63,11 +64,12 @@
 		Set Error.ErrorCode2="`"_%Exception.GeefExceptionCode()_"`"_%Exception.GeefOmschrijving()_"`"
 		Do:$IsObject(%Exception.GeefSpecifiekeData()) %Exception.GeefSpecifiekeData().XMLExportToString(.Data)
 		Set Error.Data = Data
-	}
-	else {
+		Set Error.LogLevel = ..GeefLogLevel(%Exception)
+	} else {
 		if Error.ErrorCode["<ECODETRAP>" { set Error.ErrorCode2=$ECODE }
 		Set Error.StackTrace = ##class(TECH.Process).GeefStackTrace(1)
 		Set Error.ErrorCode=$ZERROR
+		Set Error.LogLevel = "E"
 	}
 	
 	Set Error.Device=$I
@@ -98,6 +100,7 @@
 <Method name="UserText">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set Delim=$E(Error.ErrorCode)
 	
@@ -115,24 +118,58 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
 <Implementation><![CDATA[
-	Do Error.XMLExportToString(.Info,,"literal,indent")
-	Set Info = $Extract(Info,0,32000) // Voorkomen dat we over de maximum length van een String gaan.
+	#dim ErrorInfoStream As %GlobalCharacterStream = ..GeefErroInfoAlsStream(Error)
+	#dim Info As %String = ErrorInfoStream.Read(32000)
+	#dim FoutLabel As %String = $S(Error.Label="":"NoLabel",1:Error.Label)
 	
-	if $data(%Exception) && $IsObject(%Exception) {
-		Set Info = Info _ $$$CRLF_%Exception.ToString()
-		Set Info = Info _ "GebruikersInitialen: "_##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
-		Set Info = Info _ "ComputerNaam: "_##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()
-		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)
+	If Error.LogLevel = "E" {
+		Do Logger.Error(FoutLabel, Info)
+	}Else{
+		Do Logger.Warning(FoutLabel, Info)
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="MailError">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
 <Implementation><![CDATA[
+	#dim Body As %GlobalCharacterStream = ..GeefErroInfoAlsStream(Error)
+	#dim From As %String = $$$SystemMail("TECH ErrorHandler")	
+	#dim Subj As %String 
+	Set Subj = "TECH - ErrorHandler : " _
+		$select($length(Error.Label):Error.Label_" : ",1:"") _ Error.ErrorCode
+	
+	#dim To As %List = $listbuild(..GetMailAddress(Error))
+	#dim sc As %Status = $$SendMiniMailForced^vhLib.Mail(From,To,Subj,Body,1,,,,)
+	
+	If $$$ISERR(sc) {
+		Do ..CrashDuringErrorHandling($$ParseStatus^vhLib(sc))
+	}
+	
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="GeefLogLevel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Exceptie:TECH.IException</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LogLevel As %String = "E"
+	If Exceptie.%Extends(##class(TECH.Exceptions.InvalidUserInputException).%ClassName(1)) {
+		Set LogLevel = "W"
+	}
+	Quit LogLevel
+]]></Implementation>
+</Method>
+
+<Method name="GeefErroInfoAlsStream">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
 	set Body = ##class(%GlobalCharacterStream).%New()
 	
 	do Body.WriteLine("Errors:")
@@ -166,28 +203,14 @@
 	}	
 	
 	#dim WebServiceRequestStream As %Stream = ##class(vhLib.WebServiceLogger.LogService).GeefWebServiceRequestStream()
-	If $Data(WebServiceRequestStream) && $IsObject(WebServiceRequestStream) {
+	If $Data(WebServiceRequestStream) && $IsObject(WebServiceRequestStream) && ('WebServiceRequestStream.AtEnd) {
 		Do Body.WriteLine()
 		Do Body.WriteLine("Webservice Request :")
 		Do Body.WriteLine("--------------------")
 		Do Body.CopyFrom(WebServiceRequestStream)	
 		Do Body.WriteLine()
-	}
-	
-	Set From=$$$SystemMail("TECH ErrorHandler")
-	
-	
-	Set Subj="TECH - ErrorHandler : " _
-		$select($length(Error.Label):Error.Label_" : ",1:"") _ Error.ErrorCode
-	
-	Set To = $listbuild(..GetMailAddress(Error))
-	Set sc=$$SendMiniMailForced^vhLib.Mail(From,To,Subj,Body,1,,,,)
-	
-	If $$$ISERR(sc) {
-		Do ..CrashDuringErrorHandling($$ParseStatus^vhLib(sc))
-	}
-	
-	Quit
+	}	
+	Quit Body
 ]]></Implementation>
 </Method>
 
@@ -210,13 +233,14 @@
 <Method name="CrashDuringErrorHandling">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Boodschap:%String=""</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	set From = $$$SystemMail("TECH Error Handler")
-	Set Body="Bij het versturen van de errormail heeft zich een fout voorgedaan waardoor de mail niet kon verstuurd worden"
+	#dim From As %String = $$$SystemMail("TECH Error Handler")
+	#dim Body As %String = "Bij het versturen van de errormail heeft zich een fout voorgedaan waardoor de mail niet kon verstuurd worden"
 	Set Body=Body_$$$CRLF_Boodschap
-	Set Subj="TECH - ErrorHandler : Crash during error handling"
-	Set To=$listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress"))
-	Set sc=$$SendMiniMailForced^vhLib.Mail(From,To,Subj,Body,,,,,)
+	#dim Subj As %String = "TECH - ErrorHandler : Crash during error handling"
+	#dim To As %List = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress"))
+	#dim sc As %Status =$$SendMiniMailForced^vhLib.Mail(From,To,Subj,Body,,,,,)
 ]]></Implementation>
 </Method>
 </Class>