Index: WS/Prod/OptiBox/OptiServer.cls.xml
===================================================================
diff -u -r31560 -r32575
--- WS/Prod/OptiBox/OptiServer.cls.xml	(.../OptiServer.cls.xml)	(revision 31560)
+++ WS/Prod/OptiBox/OptiServer.cls.xml	(.../OptiServer.cls.xml)	(revision 32575)
@@ -743,32 +743,30 @@
 	#dim pxStatus as BL.Sys.Proxy.pxStatus
 	#dim BL as BL.PPS.TBX.WPAbstract
 
-	Set varDataSet=$$$NULLOREF
+	Set varDataSet = $$$NULLOREF
 
 	$$$ReInstateSession(SessionKey)
 
-	Do ..WijzigWerkpostIndienLOSCOMP(.Werkpost,BatchID)
+	Do ..WijzigWerkpostIndienLOSCOMP(.Werkpost, BatchID)
 	
 	$$$CheckAccess($$$rsPPSTBXOptiBox,$$$prRead)
-	#dim Categorie as APPS.Halux.common.enu.Categorie=..GeefCategorieFromBatch(BatchID)
-	If ..IsOudeWijzeVanVerwerkingFromCategorie(Categorie,Werkpost)
-	{
-
-		Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
-		Set:(WPClassName="") pxStatus=$$$pxStatusErrorEx("Onbekende werkpost.",Werkpost)
-		If $$$pxStatusIsOK(pxStatus)
-		{
-			#dim QueryName as %String=WPClassName_":QueueList"
-			Set pxStatus=##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,QueryName,BatchID)
+	
+	#dim Categorie as APPS.Halux.common.enu.Categorie = ..GeefCategorieFromBatch(BatchID)
+	
+	If (..IsOudeWijzeVanVerwerkingFromCategorie(Categorie, Werkpost)) {		
+		Set WPClassName = ##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
+		Set:(WPClassName = "") pxStatus = $$$pxStatusErrorEx("Onbekende werkpost.", Werkpost)
+		
+		If $$$pxStatusIsOK(pxStatus) {
+			#dim QueryName as %String = WPClassName _ ":QueueList"
+			Set pxStatus = ##class(BL.Sys.Proxy.pxXMLDataSet).CreateQuery(.varDataSet,QueryName,BatchID)
 		}
-	}
-	ElseIf (Werkpost = $$$wpPers)
-	{
+	} ElseIf (Werkpost = $$$wpPers)	{		
 		Set pxStatus = $$$pxStatusErrorEx("Geen lijst voor werkpost " _ Werkpost, Werkpost)
-	}
-	Else  ; Nieuwe verwerking
-	{
+	} Else {		
+		; Nieuwe verwerking
 		#dim WerkpostImpl As APPS.Halux.PPS.Verpakking.KartonWerkpost = ..GeefWerkpostImpl(Werkpost)
+		
 		If (WerkpostImpl = "") {
 			Set pxStatus = $$$pxStatusErrorEx("Onbekende werkpost " _ Werkpost, Werkpost)
 		} Else {
@@ -873,7 +871,7 @@
 <ReturnType>BL.Sys.Proxy.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
+	#dim Logger As vhLib.Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
 	Do Logger.Debug("GetProductURL", "Werkpost: " _ Werkpost _ " QueueID: " _ QueueID)
 
 	#dim WPClassName as %String
@@ -886,17 +884,15 @@
 	
 	$$$CheckAccess($$$rsPPSTBXOptiBox,$$$prRead)
 	
-	If ..IsOudeWijzeVanVerwerkingFromQueueID(QueueID,Werkpost)
-	{
+	If ..IsOudeWijzeVanVerwerkingFromQueueID(QueueID,Werkpost) {
 		Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
 		Set:(WPClassName="") pxStatus=$$$pxStatusErrorEx("Onbekende werkpost.",Werkpost)
-		If $$$pxStatusIsOK(pxStatus)
-		{
+		
+		If $$$pxStatusIsOK(pxStatus) {
 			Set URL=$ZOBJCLASSMETHOD(WPClassName,"ProductURL",,..GetID(QueueID))
 		}
-	}
-	Else  ; Nieuwe verwerking
-	{
+	} Else {
+		; Nieuwe verwerking
 		#dim Categorie as APPS.Halux.common.enu.Categorie=..GeefCategorie(QueueID)
 		Set URL=""
 		/// TODO
@@ -915,7 +911,7 @@
 <ReturnType>BL.Sys.Proxy.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
+	#dim Logger As vhLib.Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
 	Do Logger.Debug("AllFromBatch", "Werkpost: " _ Werkpost _ " BatchID: " _ BatchID _ " ExcludeList: " _ ExcludeList)
 	Do ..WijzigWerkpostIndienLOSCOMP(.Werkpost,BatchID)
 	Do Logger.Debug("AllFromBatch", "Werkpost: " _ Werkpost _ " BatchID: " _ BatchID _ " ExcludeList: " _ ExcludeList)
@@ -931,26 +927,21 @@
 	
 	$$$CheckAccess($$$rsPPSTBXOptiBox,$$$prUse)
 	
-	If ..IsOudeWijzeVanVerwerkingFromBatch(BatchID,Werkpost)
-	{
+	If ..IsOudeWijzeVanVerwerkingFromBatch(BatchID,Werkpost) {
 
 		Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
 		Set:(WPClassName="") pxStatus=$$$pxStatusErrorEx("Onbekende werkpost.",Werkpost)
-		If $$$pxStatusIsOK(pxStatus)
-		{
+		If $$$pxStatusIsOK(pxStatus) {
 			Set BL=$ZOBJCLASSMETHOD(WPClassName,"Instantiate")
-			If $G(RunInBackGround)
-			{
+			
+			If $G(RunInBackGround) {
 				Set pxStatus=BL.JobAllFromBatch(BatchID,ExcludeList) ; returns always: OK
-			}
-			Else
-			{
+			} Else {
 			 	Set pxStatus=BL.AllFromBatch(BatchID,ExcludeList)
 			}
 		}
-	}
-	Else  ; Nieuwe verwerking
-	{
+	} Else {
+		 ; Nieuwe verwerking
 		#dim WerkpostImpl As APPS.Halux.PPS.Verpakking.KartonWerkpost = ..GeefWerkpostImpl(Werkpost)
 		Set pxStatus = WerkpostImpl.AllFromBatch(BatchID)
 	}
@@ -969,7 +960,7 @@
 <ReturnType>BL.Sys.Proxy.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
+	#dim Logger As vhLib.Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
 	Do Logger.Debug("Bulk", "Werkpost: " _ Werkpost _ " DoosType: " _ DoosType _ " Aantal: " _ Aantal)
 
 	#dim WPClassName as %String
@@ -1010,11 +1001,9 @@
 <ReturnType>BL.Sys.Proxy.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
+	#dim Logger As vhLib.Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
+	Do Logger.Debug("ModifyStatus", "Werkpost: " _ Werkpost _ " BatchID: " _ BatchID _ " QueueIDs: " _ QueueIDs _ " Actie: " _ Actie)
 
-	Set Logger = ##class(vhLib.Logger).%New("HALUX.KARTON")
-	Do Logger.Debug("ModifyStatus", "Werkpost: " _ Werkpost _ " BatchID: " _ BatchID _ " QueueID: " _ QueueID _ " Actie: " _ Actie)
-
 	Set varDataSet=$$$NULLOREF
 
 	$$$ReInstateSession(SessionKey)
@@ -1024,28 +1013,26 @@
 	#dim WPClassName as %String
 	#dim pxStatus as BL.Sys.Proxy.pxStatus
 	#dim BL as BL.PPS.TBX.WPAbstract
-	For I=1:1:$L(QueueIDs,";")
-	{
+	
+	For I=1:1:$L(QueueIDs,";") {
 		#dim QueueID as %String = $P(QueueIDs,";",I)
-		If QueueID'="" && $$$pxStatusIsOK(pxStatus)
-		{
-			If ..IsOudeWijzeVanVerwerkingFromQueueID(QueueID,Werkpost)
-			{
+		If QueueID'="" && $$$pxStatusIsOK(pxStatus) {
+			If ..IsOudeWijzeVanVerwerkingFromQueueID(QueueID,Werkpost) {
 				Set WPClassName=##class(BL.PPS.TBX.OptiBox).GetWPClassName(Werkpost)
 				Set:(WPClassName="") pxStatus=$$$pxStatusErrorEx("Onbekende werkpost.",Werkpost)
-				If $$$pxStatusIsOK(pxStatus)
-				{
+				
+				If $$$pxStatusIsOK(pxStatus) {
 					Set BL=$ZOBJCLASSMETHOD(WPClassName,"Instantiate")
 
 					Set pxStatus=BL.ModifyStatus(..GetID(QueueID),Actie)
 				}
-			}
-			Else ; Nieuwe verwerking
-			{
+			} Else {
+				; Nieuwe verwerking
 				#dim Categorie as APPS.Halux.common.enu.Categorie=..GeefCategorie(QueueID)
 
 				Set pxStatus=$$$pxStatusOK
-				/// TODO
+				
+				Do Logger.Warning("ModifyStatus", "Nieuwe verwerking aangeroepen maar nog niet geïmplementeerd")
 			}
 		}
 	}
@@ -1057,16 +1044,6 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-
- HELPER METHODS
-
- */
-]]></Content>
-</UDLText>
-
 <Method name="GeefWerkpostImpl">
 <FormalSpec>WerkpostID:%String</FormalSpec>
 <Private>1</Private>
@@ -1102,7 +1079,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Quit:(WerkpostID = ##class(APPS.Halux.PPS.Verpakking.enu.KartonWerkpost).LosseComponenten()) $$$False
-	Quit (Categorie=##class(APPS.Halux.common.enu.Categorie).Tandembox())||(Categorie=##class(APPS.Halux.common.enu.Categorie).TAORbox())
+	Quit (Categorie = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) || (Categorie = ##class(APPS.Halux.common.enu.Categorie).TAORbox())
 ]]></Implementation>
 </Method>
 
@@ -1121,14 +1098,13 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Categorie as APPS.Halux.common.enu.Categorie
-	If $L(CatAndID,"||")=2
-	{
-		Set Categorie=$P(CatAndID,"||")
-	}
-	else
-	{
+	
+	If $Length(CatAndID,"||")=2 {
+		Set Categorie=$Piece(CatAndID,"||")
+	} else {
 		Set Categorie=##class(APPS.Halux.common.enu.Categorie).Tandembox()
 	}
+	
 	Quit Categorie
 ]]></Implementation>
 </Method>
@@ -1139,14 +1115,13 @@
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 	#dim ID as %Integer
-	If $L(CatAndID,"||")=2
-	{
-		Set ID=$P(CatAndID,"||",2)
-	}
-	else
-	{
+	
+	If $Length(CatAndID,"||")=2 {
+		Set ID=$Piece(CatAndID,"||",2)
+	} else {
 		Set ID=CatAndID
 	}
+	
 	Quit ID
 ]]></Implementation>
 </Method>