Index: WS/Derde/Agenda/AgendaServer.cls.xml
===================================================================
diff -u -r1133 -r1352
--- WS/Derde/Agenda/AgendaServer.cls.xml	(.../AgendaServer.cls.xml)	(revision 1133)
+++ WS/Derde/Agenda/AgendaServer.cls.xml	(.../AgendaServer.cls.xml)	(revision 1352)
@@ -3,7 +3,7 @@
 <Class name="WS.Derde.Agenda.AgendaServer">
 <IncludeCode>BL.EC.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebService</Super>
+<Super>WS.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="SERVICENAME">
@@ -63,7 +63,11 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
+
+	$$$LogIncomming(WS.Derde.AgendaServerLogger,UpdateRegistraties)
 	
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","Lijst","UserID: "_UserID_", Datum: "_Datum_", Types: "_Types_", Compact: "_Compact)
 	
@@ -75,6 +79,8 @@
 	Do Result.SetArgs(UserID,Datum,Types,.Compact,$S($G(LijnSeparator)="":">CR<",1:LijnSeparator))
 	Set Result.DiffGram=0
 	Set Result.NeedSchema=0
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -90,6 +96,8 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","LijstSimple","UserID: "_UserID_", Datum: "_Datum_", Types: "_Types)
@@ -104,6 +112,9 @@
 	Do Result.SetArgs(UserID,Datum,List)
 	Set Result.DiffGram=0 
 	Set Result.NeedSchema=0
+	
+	$$$TECHErrorTrapOff
+	
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -118,6 +129,8 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 	
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","Sommatie","UserID: "_UserID_", Datum: "_Datum)
@@ -129,6 +142,9 @@
 	Do Result.SetArgs(UserID,Datum)
 	Set Result.DiffGram=0 
 	Set Result.NeedSchema=0
+	
+	$$$TECHErrorTrapOff
+	
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -138,7 +154,6 @@
 d ##class(WS.Derde.Agenda.AgendaServer).test()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	
 	;s pxAgenda=..GetAgenda(22,"20100929",3553)
 	s pxAgenda=##class(BL.Derde.Agenda.pxAgenda).%New()
 	s pxAgenda.Datum="20100528"
@@ -188,6 +203,8 @@
 <ReturnType>BL.Derde.Agenda.pxAgenda</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","Get","UserID: "_UserID_", Datum: "_Datum_", SubID: "_SubID)
@@ -196,6 +213,8 @@
 	Do BL.Initialize(UserID)
 	Set Datum=$ZDH($TR(Datum,"./- ",""),5) ; omvormen naar $H formaat
 	Set Result=BL.GetAgenda(Datum,SubID)
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -206,13 +225,19 @@
 <ReturnType>BL.Derde.Agenda.pxAgenda</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","Verwijder","UserID: "_UserID_", Datum: "_Datum_", SubID: "_SubID)
 	
 	Set BL=##class(BL.Derde.Agenda.Agenda).%New()
 	set Identifier = UserID_"||"_Datum_"||"_SubID
-	quit BL.VerwijderAgendaObject(Identifier)
+	
+	set result = BL.VerwijderAgendaObject(Identifier)
+	
+	$$$TECHErrorTrapOff
+	quit result
 ]]></Implementation>
 </Method>
 
@@ -222,6 +247,8 @@
 <ReturnType>BL.Derde.Agenda.pxAgenda</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","Get","UserID: "_UserID_", Datum: "_Datum_", SubID: "_SubID)
@@ -230,6 +257,8 @@
 	Do BL.Initialize(UserID)
 	Set Datum=$ZDH($TR(Datum,"./- ",""),5) ; omvormen naar $H formaat
 	Set Result=BL.GetAgenda(Datum,SubID)
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -255,6 +284,8 @@
 <ReturnType>BL.Derde.Agenda.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	;$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 
@@ -263,6 +294,8 @@
 	Set BL=##class(BL.Derde.Agenda.Agenda).%New()
 	Do BL.Initialize(pxAgenda.Gebruiker)
 	Set Result=BL.StoreAgenda(pxAgenda)
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -279,8 +312,11 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Quit:DerdeRef="" ""
-	Quit:DerdeType="" ""
+	
+	Quit:$G(DerdeRef)="" ""
+	Quit:$G(DerdeType)="" ""
+	
+	$$$TECHErrorTrapOn
 
 	$$$ReInstateSession(SessionKey)
 	
@@ -295,6 +331,8 @@
 	Do Result.SetArgs(DerdeRef)
 	Set Result.DiffGram=0 
 	Set Result.NeedSchema=0
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -310,6 +348,8 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","ZoekDerde","")
@@ -336,6 +376,8 @@
 	Set Result.DiffGram=0 
 	Set Result.NeedSchema=0
 	
+	$$$TECHErrorTrapOff
+	
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -363,8 +405,8 @@
 	Set Datum=$ZDH($TR(Datum,"./- ",""),5) ; omvormen naar $H formaat
 	Set TijdVan=$ZTH($TR(TijdVan,"/;., ",":::::")) ; omvormen naar $H formaat
 	Set TijdTot=$ZTH($TR(TijdTot,"/;., ",":::::")) ; omvormen naar $H formaat
-	s ^PVTemp(SubID)=Tekst
 	Set Result=BL.StoreAgenda( Datum, SubID, TijdVan, TijdTot, Type, DerdeType, DerdeRef, Tekst)
+	
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -379,6 +421,8 @@
 <ReturnType>BL.Derde.Agenda.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","MarkHoliday","UserID: "_UserID_", Datum: "_Datum)
@@ -387,6 +431,8 @@
 	Do BL.Initialize(UserID)
 	Set Datum=$ZDH($TR(Datum,"./- ",""),5) ; omvormen naar $H formaat
 	Set Result=BL.MarkHoliday(Datum)
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -404,6 +450,8 @@
 <ReturnType>BL.Derde.Agenda.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","UpdateGeoData","UserID: "_UserID_", ClearLastDay: "_ClearLastDay)
@@ -412,6 +460,8 @@
 	Do BL.Initialize(UserID)
 	Do BL.DeleteVanafDag()
 	Set Result=BL.Update()
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -432,6 +482,8 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","ValidateUserList","Name: "_Name_", Password: "_Password)
@@ -461,6 +513,7 @@
 	Set Result.DiffGram=0
 	Set Result.NeedSchema=0
 	;Set:UserID Status=..UpdateGeoData(UserID)
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -471,6 +524,9 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 	
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","ValidateUserListViaSession","")
@@ -486,6 +542,7 @@
 	Do Result.SetArgs(ToegangObj.AgendaMedewerkers,"")
 	Set Result.DiffGram=0
 	Set Result.NeedSchema=0
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -496,6 +553,8 @@
 <ReturnType>BL.Derde.Agenda.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	Set Info = "Naam: "_pxEindgebruiker.Naam _ "ID : " _pxEindgebruiker.ID
@@ -506,6 +565,7 @@
 	Set Result=##class(BL.Derde.Agenda.pxStatus).%New()
 	Set:scStore Result.Status=scStore
 	Set:$$$Not(scStore) Result.Status=$$ParseStatus^vhLib(scStore)
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -516,6 +576,8 @@
 <ReturnType>BL.Derde.Agenda.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"TOONZAALBEZOEK","StoreToonzaalBezoek","")
@@ -528,6 +590,7 @@
 		set Result.Data = ToonzaalBezoekID 
 	}
     else { Set Result.Status=$$ParseStatus^vhLib(scStore) }
+    $$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -540,13 +603,17 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"TOONZAALBEZOEK","GetAanleidingen","")
 	
 	Set Result=##class(BL.EC.pxXMLDataSet).%New("BL.Derde.Agenda.AgendaServer:AanleidingList")
 	Set Result.DiffGram=0
 	Set Result.NeedSchema=0
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -559,13 +626,16 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"TOONZAALBEZOEK","GetCateringTypes","")
 	
 	Set Result=##class(BL.EC.pxXMLDataSet).%New("BL.Derde.Agenda.AgendaServer:CateringList")
 	Set Result.DiffGram=0
 	Set Result.NeedSchema=0
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -576,6 +646,7 @@
 <ReturnType>BL.EC.pxXMLDataSet</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
 
 	$$$ReInstateSession(SessionKey)
 
@@ -585,6 +656,8 @@
 	Do Result.SetArgs(pxZoekOpties)
 	Set Result.DiffGram=0
 	Set Result.NeedSchema=0
+	
+	$$$TECHErrorTrapOff
 	Quit Result
 ]]></Implementation>
 </Method>
@@ -597,13 +670,17 @@
 <ReturnType>BL.Derde.Agenda.pxUser</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	
 	$$$ReInstateSession(SessionKey)
 
 	$$$AddToLog($$$logGrpAgenda,"AGENDA","GetUserInfo","UserID: "_UserID)
 
 	Set Info=##class(BL.Derde.Agenda.pxUser).%New()
 	Do Info.Fill(UserID)
 	Do ..UpdateGeoData(UserID)
+	
+	$$$TECHErrorTrapOff
 	Quit Info
 ]]></Implementation>
 </Method>