Index: BL/EC/Common.mac.rou
===================================================================
diff -u -r1523 -r1761
--- BL/EC/Common.mac.rou	(.../Common.mac.rou)	(revision 1523)
+++ BL/EC/Common.mac.rou	(.../Common.mac.rou)	(revision 1761)
@@ -19,23 +19,24 @@
 	Quit Logging
   
 AddErrorToLog(Groep, Actie, Error,Detail)
+	Set Error = $$ParseStatus^vhLib(Error)
 	If $isObject($G(%ECSession)) Do 
-	. Set Logging=##class(Derde.EC.Logging).Create(,,%ECSession.%Id(),%ECSession.ToegangID,%ECSession.KlantNr,$$$logGrpError,.Groep,.Actie,$G(Detail)_"~"_$$ParseStatus^vhLib(Error),$STACK($STACK-2,"PLACE"))
+	. Set Logging=##class(Derde.EC.Logging).Create(,,%ECSession.%Id(),%ECSession.ToegangID,%ECSession.KlantNr,$$$logGrpError,.Groep,.Actie,$G(Detail)_"~"_Error,$STACK($STACK-2,"PLACE"))
 	. $$$blToegang
 	. Set Body="SessionID: "_%ECSession.%Id()
 	. Set Body=Body_$C(13)_"ToegangID: "_%ECSession.ToegangID
 	. Set Body=Body_$C(13)_"Klant: "_%ECSession.KlantNr
 	. Set oToegang=%blToegang.OpenID(%ECSession.ToegangID)
 	. Set Body=Body_$C(13)_"User: "_oToegang.UserNaam
 	Else  Do
-	. Set Logging=##class(Derde.EC.Logging).Create(,,,,,$$$logGrpError,.Groep,.Actie,$G(Detail)_"~"_$$ParseStatus^vhLib(Error),$STACK($STACK-2,"PLACE"))
+	. Set Logging=##class(Derde.EC.Logging).Create(,,,,,$$$logGrpError,.Groep,.Actie,$G(Detail)_"~"_Error,$STACK($STACK-2,"PLACE"))
 	. Set Body=""
 	
 	; Mail versturen van de fout
 	Set Body=Body_$C(13)_"Groep: "_$G(Groep)
 	Set Body=Body_$C(13)_"Actie: "_$G(Actie)
 	Set Body=Body_$C(13)_"Detail: "_$G(Detail)
-	Set Body=Body_$C(13)_"Error: "_$$ParseStatus^vhLib(Error)
+	Set Body=Body_$C(13)_"Error: "_Error
 	Set Body=Body_$C(13,13)_"$ZError: "_$ZError
 	Set:$G(%objlasterror)'="" Body=Body_$C(13)_"Object Last Error: "_$$ParseStatus^vhLib(%objlasterror)
 	Set Body=Body_$C(13)_"$ECode: "_$ECode
@@ -46,8 +47,11 @@
 	Set From=$$$SystemMail("VHISIE")
 	Set Subj="VHISIE - Error to Log"
 	Set To=$lb(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.EC.Common.MailErrorNaar"))
-	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
 	
+	Do ##class(vhLib.Logger).%New("Vhisie").Error(Actie,Body)
+	
+	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)	
+	
 	Quit Logging
  
 WebServiceTrap()
@@ -72,7 +76,10 @@
 	Set Subj="VHISIE - Errortrap "_$ZError
 	Set To=$lb(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.EC.Common.MailErrorNaar"))
 	/*   */       ; ORIG code - door PV
-	Do SendMiniMail^vhLib(From,To,Subj,Body,,,,,)
+	
+	Do AddErrorToLog^BL.EC.Common("FOUT", "$ZError", 1,$ZError)
+	
+	
 	/*   * /             
 	; Uitgebreide code - door WimV   [met de bedoeling om TIJDELIJK de mass-mail te vermijden]
 	If $$$GETERRORCODE(%objlasterror)=$$$CSPTimeout Do
Index: WS/EC/WebShopServer.cls.xml
===================================================================
diff -u -r1643 -r1761
--- WS/EC/WebShopServer.cls.xml	(.../WebShopServer.cls.xml)	(revision 1643)
+++ WS/EC/WebShopServer.cls.xml	(.../WebShopServer.cls.xml)	(revision 1761)
@@ -53,7 +53,9 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit 1_" - "_$$$Server_" - "_$$$NSpace_" - "_..%ClassName(1)
+<Implementation><![CDATA[
+	$$$WebServiceTrap
+	Quit 1_" - "_$$$Server_" - "_$$$NSpace_" - "_..%ClassName(1)
 ]]></Implementation>
 </Method>
 
@@ -66,7 +68,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#Include BL.EC.Common
-
+	$$$WebServiceTrap
 	$$$blSession
 	Set Status=%blSession.ReInstateSession(SessionID)
 	Quit:$IsObject(Status) ""
@@ -96,7 +98,7 @@
 <Implementation><![CDATA[
 	
 	#Include BL.EC.Common
-
+	$$$WebServiceTrap
 	$$$blSession
 	Set Status=%blSession.ReInstateSession(SessionID)
 	Quit:$IsObject(Status) ""
@@ -125,7 +127,7 @@
 <Implementation><![CDATA[
 
    #Include BL.EC.Common
-
+	$$$WebServiceTrap
    $$$blSession
    Set Status=%blSession.ReInstateSession(SessionID)
    
@@ -334,7 +336,7 @@
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
+	$$$WebServiceTrap
 	;$$$TECHErrorTrapOn
 	
 	set Logger = ##class(BL.EC.DynaplugLogger).%New()
@@ -399,7 +401,7 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"New","")
 	$$$blWebShop
@@ -420,7 +422,7 @@
 <ReturnType>BL.EC.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	Set:$L($G(WebShopID)) WebShopID=$TR(WebShopID,".","") ; Nummer is geformateerd met duizend separator
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"SetFocus",WebShopID)
@@ -441,9 +443,10 @@
 <ReturnType>BL.EC.pxWebShop</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
+	
 	Set WebShopID=$$$StripC0(WebShopID)
 
-	;$$$WebServiceTrap
 	Set:$L($G(WebShopID)) WebShopID=$TR(WebShopID,".","") ; Nummer is geformateerd met duizend separator
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"GetActueel",$S($G(WebShopID)="":%ECSession.WebShopID,1:WebShopID))
@@ -468,9 +471,7 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
-	
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"CopyOfferte",OfferteID)
 	$$$blWebShop
@@ -486,7 +487,6 @@
 <ReturnType>BL.EC.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	Set LogText=%ECSession.WebShopID_"; GVO="_$G(GoedVoorOrder)
@@ -538,7 +538,6 @@
 <ReturnType>BL.EC.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"GoedVoorOrder",%ECSession.WebShopID)
@@ -598,7 +597,7 @@
 <ReturnType>%Status</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"DelLijn",%ECSession.WebShopID_"~"_LijnID)
 	$$$blWebShop
@@ -615,6 +614,7 @@
 <ReturnType>BL.EC.pxProductDtl</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	;$$$ControleToegang($$$tgWebShop,"GetProdQty",%ECSession.WebShopID_"~"_Product)
 	$$$blProduct
@@ -635,6 +635,7 @@
 <ReturnType>BL.EC.pxWizard</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"InitWizard",%ECSession.WebShopID_"~"_ToegangWizard_"~"_$G(Default))
 	$$$blWizard
@@ -651,6 +652,7 @@
 <ReturnType>BL.EC.pxWizard</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"ModifyWizard",%ECSession.WebShopID_"~"_Product_"~"_$G(Wizard))
 	$$$blWebShop
@@ -695,7 +697,7 @@
 <ReturnType>%Status</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"AddProdLijn",%ECSession.WebShopID_"~"_$S($isObject($G(pxGAData)):pxGAData.%ClassName(),1:Product)_"~"_$G(Aantal))
 	$$$blWebShop
@@ -727,7 +729,7 @@
 <ReturnType>%Status</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"ModProdLijn",%ECSession.WebShopID_"~"_$S($isObject($G(pxGAData)):pxGAData.%ClassName(),1:$G(Product))_"~"_$G(Aantal))
 	$$$blWebShop
Index: Derde/EC/Logging.cls.xml
===================================================================
diff -u -r1074 -r1761
--- Derde/EC/Logging.cls.xml	(.../Logging.cls.xml)	(revision 1074)
+++ Derde/EC/Logging.cls.xml	(.../Logging.cls.xml)	(revision 1761)
@@ -76,7 +76,7 @@
 	Set oLog=..%New()
 	Do oLog.Init(.Datum,.Tijd,.SessionKey,.ToegangID,.KLNr,.Niveau,.Groep,.Actie,.Detail,.ProgLabel)
 	Do oLog.%Save()
-	;Do oLog.Debug()
+	Do oLog.Debug()
 	Quit oLog
 ]]></Implementation>
 </Method>
@@ -101,7 +101,7 @@
 <Method name="Debug">
 <Implementation><![CDATA[
 	Set %ClientIP=$G(%ClientIP,"192.168.1.15")
-	Do WL^vhDBG(..SessionKey_"->Niv:"_..Niveau_" Groep:"_..Groep_$S($L(..Actie):" Actie:"_..Actie,1:"")_$S($L(..Detail):" Detail:"_..Detail,1:"")_$S($L(..ProgLabel):" ProgLabel:"_..ProgLabel,1:""))
+	Do WLIP^vhDBG(127,..SessionKey_"->Niv:"_..Niveau_" Groep:"_..Groep_$S($L(..Actie):" Actie:"_..Actie,1:"")_$S($L(..Detail):" Detail:"_..Detail,1:"")_$S($L(..ProgLabel):" ProgLabel:"_..ProgLabel,1:""))
 ]]></Implementation>
 </Method>
 
Index: BL/EC/Session.cls.xml
===================================================================
diff -u -r1365 -r1761
--- BL/EC/Session.cls.xml	(.../Session.cls.xml)	(revision 1365)
+++ BL/EC/Session.cls.xml	(.../Session.cls.xml)	(revision 1761)
@@ -568,11 +568,12 @@
 <Implementation><![CDATA[
 	Set Status="" ; OK als leeg
 	Quit:Toegang="" Status
-
+	
 	;w $$ListToPieces^vhLib(%ECSession.Toegang),!
 	If $LF(%ECSession.Toegang,Toegang) Do
 	. Set %Logging=$$AddToLog^BL.EC.Common($$$logGrpToegang,Toegang,Actie,Detail)
 	Else  Do
+	. /// JBL opmerking 2011-08-03 : dit kan niet werken. 3e argument moet een status zijn, die wordt geparsed in AddErrorToLog !
 	. Set %Logging=$$AddErrorToLog^BL.EC.Common(Toegang,Actie,"Geen toegang tot '"_Toegang_"'",Detail)
 	. Set Status=$$$errCreate(..#errToegangNotAllowed)
 	Quit Status
Index: WS/EC/ProductServer.cls.xml
===================================================================
diff -u -r1133 -r1761
--- WS/EC/ProductServer.cls.xml	(.../ProductServer.cls.xml)	(revision 1133)
+++ WS/EC/ProductServer.cls.xml	(.../ProductServer.cls.xml)	(revision 1761)
@@ -57,7 +57,7 @@
 <FormalSpec>SessionKey</FormalSpec>
 <ReturnType>BL.EC.pxemItem</ReturnType>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$blProduct
 	Quit %blProduct.KlantTreeStructure()
@@ -78,7 +78,7 @@
 <ReturnType>BL.EC.pxProductDtl</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgProductTree,"Dtl",Product)
 	
@@ -115,7 +115,7 @@
 <ReturnType>BL.EC.pxemItem</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgProductTree,"Get","")
 	$$$blProduct
Index: WS/EC/UserServer.cls.xml
===================================================================
diff -u -r1074 -r1761
--- WS/EC/UserServer.cls.xml	(.../UserServer.cls.xml)	(revision 1074)
+++ WS/EC/UserServer.cls.xml	(.../UserServer.cls.xml)	(revision 1761)
@@ -40,7 +40,7 @@
 <Implementation><![CDATA[
 	;$$$WebServiceTrap
 	$$$blSession
-	
+
 	Set Status=%blSession.LogInUser(GebruikersNaam,WachtWoord,EncryptType,.Taal,.Domein,.ClientIP,.Result,.AttemptCount)
 	
 	Set Msg="User:"_$G(GebruikersNaam)_", WW:"_$G(WachtWoord)_", EncryptT:"_$G(EncryptType)_$S($L(Domein)="":"",1:", Domein:"_$G(Domein))
@@ -69,6 +69,7 @@
 <Implementation><![CDATA[
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
+	
 	Set %Logging=$$AddToLog^BL.EC.Common($$$logGrpToegang,"TG","LogOut")
 
 	$$$blSession
@@ -135,12 +136,12 @@
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$blToegang
+	
 	Set:$G(ZoekType)=$C(0) ZoekType=""
 	Set %Logging=$$AddToLog^BL.EC.Common($$$logGrpToegang,$$$tgKlantSelect,"ZoekKlant","Crit:"_$G(Criteria)_";Type:"_$G(ZoekType))
 	Quit:(Criteria="")||(Criteria=$C(0)) ""
 	Set Result=##class(BL.EC.pxXMLDataSet).%New("BL.EC.Toegang:ZoekKlant")
 	Do Result.SetArgs(Criteria,.ZoekType)
-
 	;Set Result=%blToegang.ZoekKlant(Criteria,$G(ZoekType))
 	If Result.%ClassName(1)["DataSet"
 	. Set Result.DiffGram=0 
@@ -198,7 +199,6 @@
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	Set %Logging=$$AddToLog^BL.EC.Common($$$logGrpToegang,$$$tgKlantSelect,"SaveScreenSettings","KPR:"_$G(KlantProdRef)_",TUG:"_$G(TonenUitGebreid)_",TPD:"_$G(TonenProductDetail)_",MGS:"_$G(MetGroepScheiding)_",TAAL:"_$G(Taal))
-
 	Quit %blSession.SaveSettings(.KlantProdRef, .TonenUitgebreid, .TonenProductDetail,.MetGroepScheiding,.Taal)
 ]]></Implementation>
 </Method>