Index: APPS/VisiDot/impl/VHossCaptureHelper.cls.xml
===================================================================
diff -u -r1787 -r1791
--- APPS/VisiDot/impl/VHossCaptureHelper.cls.xml	(.../VHossCaptureHelper.cls.xml)	(revision 1787)
+++ APPS/VisiDot/impl/VHossCaptureHelper.cls.xml	(.../VHossCaptureHelper.cls.xml)	(revision 1791)
@@ -93,13 +93,18 @@
 <Method name="GeefBatchID">
 <Implementation><![CDATA[
 	
-	Quit ..GeefERPSleutelWaarde("BatchID")
+	//Quit ..GeefERPSleutelWaarde("BatchID")
+	// JBL : volgens uitleg in mail van 2011-08-08 moeten de batchID's in de Director zitten,
+	// Indien niet worden ze niet mee terug gestuurd bij een volgende read.
+	Quit ..GeefDirectorSleutelWaarde("BatchID")
 ]]></Implementation>
 </Method>
 
 <Method name="ZetBatchID">
 <FormalSpec>BatchID</FormalSpec>
-<Implementation><![CDATA[	Do ..ZetERPSleutelWaarde("BatchID",BatchID,1)
+<Implementation><![CDATA[
+	Do ..ZetERPSleutelWaarde("BatchID",BatchID,1)
+	Do ..ZetDirectorSleutelWaarde("BatchID",BatchID,1)
 ]]></Implementation>
 </Method>
 
Index: APPS/VisiDot/impl/CaptureHelper.cls.xml
===================================================================
diff -u -r1774 -r1791
--- APPS/VisiDot/impl/CaptureHelper.cls.xml	(.../CaptureHelper.cls.xml)	(revision 1774)
+++ APPS/VisiDot/impl/CaptureHelper.cls.xml	(.../CaptureHelper.cls.xml)	(revision 1791)
@@ -160,11 +160,9 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method GeefDirector() [ Private ]
-{
+<Method name="GeefDirector">
+<Private>1</Private>
+<Implementation><![CDATA[
 	If '$isobject(..CaptureInfo.Director)
 	{
 		 Set ..CaptureInfo.Director=##class(%ListOfObject).%New()
@@ -178,10 +176,12 @@
 		Do ..CaptureInfo.Director.Insert(Director)
 	}
 	Quit Director
-}
+]]></Implementation>
+</Method>
 
-Method GeefDirectorSleutelWaarde(Sleutel)
-{
+<Method name="GeefDirectorSleutelWaarde">
+<FormalSpec>Sleutel</FormalSpec>
+<Implementation><![CDATA[
 	Quit:'$isobject(..CaptureInfo.Director) ""
 	Set Director=..CaptureInfo.Director.GetAt(1)
 	Quit:'$isObject(Director) ""
@@ -190,17 +190,17 @@
 	Set ReadData=..ZoekSleutel(Director.ReadData,Sleutel)
 	Quit:'$isObject(ReadData) ""
 	Quit ReadData.Value
-}
+]]></Implementation>
+</Method>
 
-Method ZetDirectorSleutelWaarde(Sleutel,Waarde)
-{
+<Method name="ZetDirectorSleutelWaarde">
+<FormalSpec>Sleutel:%String,Waarde:%String,BewaarVoorHergebruik:%Boolean=0</FormalSpec>
+<Implementation><![CDATA[
 	Set Director=..GeefDirector()
 	Set:'$isObject(Director.ReadData) Director.ReadData=##class(%ListOfObject).%New()
-	Do ..AddSleutelWaarde(Director.ReadData,Sleutel,Waarde)
-}
-*/
-]]></Content>
-</UDLText>
+	Do ..AddSleutelWaarde(Director.ReadData,Sleutel,Waarde, BewaarVoorHergebruik)
+]]></Implementation>
+</Method>
 
 <Method name="GeefERPSleutelWaarde">
 <FormalSpec>Sleutel</FormalSpec>
@@ -217,11 +217,11 @@
 </Method>
 
 <Method name="ZetERPSleutelWaarde">
-<FormalSpec>Sleutel,Waarde,BewaarVoorHergebruik</FormalSpec>
+<FormalSpec>Sleutel:%String,Waarde:%String,BewaarVoorHergebruik:%Boolean=0</FormalSpec>
 <Implementation><![CDATA[
 	Set ERP=..GeefERP()
 	Set:'$isObject(ERP.ReadData) ERP.ReadData=##class(%ListOfObject).%New()
-	Do ..AddSleutelWaarde(ERP.ReadData,Sleutel,Waarde)
+	Do ..AddSleutelWaarde(ERP.ReadData,Sleutel,Waarde, BewaarVoorHergebruik)
 ]]></Implementation>
 </Method>
 
@@ -244,7 +244,7 @@
 </Method>
 
 <Method name="AddSleutelWaarde">
-<FormalSpec>List,Sleutel,Waarde,BewaarVoorHergebruik</FormalSpec>
+<FormalSpec>List,Sleutel:%String,Waarde:%String,BewaarVoorHergebruik:%Boolean=0</FormalSpec>
 <Implementation><![CDATA[
 	Set ReadData=..ZoekSleutel(List,Sleutel)
 	If $isobject(ReadData)
@@ -257,7 +257,7 @@
 		Set ReadData=##class(APPS.VisiDot.dto.ReadData).%New()
 		Set ReadData.Name=Sleutel
 		Set ReadData.Value=Waarde
-		Set:$G(BewaarVoorHergebruik) ReadData.Preserved=BewaarVoorHergebruik
+		Set:(BewaarVoorHergebruik'=0) ReadData.Preserved=BewaarVoorHergebruik
 		Do List.Insert(ReadData)
 	}
 ]]></Implementation>
Index: APPS/VisiDot/impl/VHossSlotDetectionHelper.cls.xml
===================================================================
diff -u -r1754 -r1791
--- APPS/VisiDot/impl/VHossSlotDetectionHelper.cls.xml	(.../VHossSlotDetectionHelper.cls.xml)	(revision 1754)
+++ APPS/VisiDot/impl/VHossSlotDetectionHelper.cls.xml	(.../VHossSlotDetectionHelper.cls.xml)	(revision 1791)
@@ -11,7 +11,9 @@
 <Implementation><![CDATA[
 		Set Dual=..Detection.DUAL.GetAt(1)
 		Quit:'$isObject(Dual) ""
-		Quit (Dual.RowInPallet-1)*10+Dual.ColInPallet
+		Set SlotNr = (3-Dual.RowInPallet)*10+Dual.ColInPallet
+		//w ..Detection.Id, " R",Dual.RowInPallet," C",Dual.ColInPallet  ," -> ",SlotNr,!
+		Quit SlotNr
 ]]></Implementation>
 </Method>
 
Index: APPS/VisiDot/dto/Director.cls.xml
===================================================================
diff -u -r1717 -r1791
--- APPS/VisiDot/dto/Director.cls.xml	(.../Director.cls.xml)	(revision 1717)
+++ APPS/VisiDot/dto/Director.cls.xml	(.../Director.cls.xml)	(revision 1791)
@@ -3,19 +3,23 @@
 <Class name="APPS.VisiDot.dto.Director">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="XMLNAME">
 <Default>Director</Default>
 </Parameter>
 
+<Parameter name="XMLTYPE">
+<Default>Director</Default>
+</Parameter>
+
 <Parameter name="XMLSEQUENCE">
 <Default>1</Default>
 </Parameter>
 
 <Property name="ReadData">
 <Type>APPS.VisiDot.dto.ReadData</Type>
 <Collection>list</Collection>
-<Parameter name="XMLELEMENTREF" value="1"/>
 <Parameter name="XMLNAME" value="Read_Data"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
Index: APPS/VisiDot/dto/CaptureInfo.cls.xml
===================================================================
diff -u -r1717 -r1791
--- APPS/VisiDot/dto/CaptureInfo.cls.xml	(.../CaptureInfo.cls.xml)	(revision 1717)
+++ APPS/VisiDot/dto/CaptureInfo.cls.xml	(.../CaptureInfo.cls.xml)	(revision 1791)
@@ -19,25 +19,25 @@
 <Default>Capture_Info</Default>
 </Parameter>
 
-<Property name="Director">
-<Type>APPS.VisiDot.dto.Director</Type>
+<Property name="ERP">
+<Type>APPS.VisiDot.dto.ERP</Type>
 <Collection>list</Collection>
-<Parameter name="XMLELEMENTREF" value="1"/>
-<Parameter name="XMLNAME" value="Director"/>
+<Parameter name="XMLNAME" value="ERP"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
-<Property name="ERP">
-<Type>APPS.VisiDot.dto.ERP</Type>
+<Property name="Director">
+<Type>APPS.VisiDot.dto.Director</Type>
 <Collection>list</Collection>
-<Parameter name="XMLNAME" value="ERP"/>
+<Parameter name="XMLNAME" value="Director"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
 <Property name="GUI">
-<Type>%String</Type>
-<Parameter name="MAXLEN"/>
+<Type>APPS.VisiDot.dto.GUI</Type>
+<Collection>list</Collection>
 <Parameter name="XMLNAME" value="GUI"/>
+<Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
 <Property name="VRRead">
Index: vhUnitTest/APPS/VisiDot/impl/BuildVHossCapture.cls.xml
===================================================================
diff -u -r1773 -r1791
--- vhUnitTest/APPS/VisiDot/impl/BuildVHossCapture.cls.xml	(.../BuildVHossCapture.cls.xml)	(revision 1773)
+++ vhUnitTest/APPS/VisiDot/impl/BuildVHossCapture.cls.xml	(.../BuildVHossCapture.cls.xml)	(revision 1791)
@@ -6,28 +6,10 @@
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Parameter name="QueueList">
-<Description>
-format PRNr;Aantal;VHOSS.Zijkant</Description>
-<Default>418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2</Default>
-</Parameter>
-
 <Property name="BatchID">
 <Type>%Integer</Type>
 </Property>
 
-<Property name="VHossID">
-<Type>%Integer</Type>
-</Property>
-
-<Property name="SlotLabel">
-<Type>%Integer</Type>
-</Property>
-
-<Property name="SequenceNr">
-<Type>%Integer</Type>
-</Property>
-
 <Property name="VHoss">
 <Type>%String</Type>
 <MultiDimensional>1</MultiDimensional>
@@ -216,8 +198,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set Dual=##class(APPS.VisiDot.dto.DUAL).%New()
-	Set Dual.RowInPallet=(SlotNr-1)\10+1
-	Set Dual.ColInPallet=(SlotNr-1#10)+1
+	Set Dual.RowInPallet=(3-((SlotNr-1)\10))
+	Set Dual.ColInPallet= (((SlotNr-1)#10)+1)
+	//w "BuildDual : ",SlotNr," -> R",Dual.RowInPallet," C",Dual.ColInPallet,!
 	Quit Dual
 ]]></Implementation>
 </Method>
Index: Prod/Kenmerk/DataDefinitie.cls.xml
===================================================================
diff -u -r1772 -r1791
--- Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 1772)
+++ Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 1791)
@@ -111,7 +111,7 @@
 
 <Index name="IndexForSearch">
 <Data>Waarden</Data>
-<Properties>KenmerkGroep,PRNr,KenmerkNaam,UnID</Properties>
+<Properties>KenmerkGroep,PRNr,KenmerkNaam,UnID,InstanceVersion</Properties>
 </Index>
 
 <Property name="KenmerkGroep">
Index: vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml
===================================================================
diff -u -r1769 -r1791
--- vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1769)
+++ vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1791)
@@ -8,25 +8,38 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="VHossBuilder">
-<Type>%String</Type>
+<Type>vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture</Type>
 </Property>
 
 <Property name="CaptureHelper">
-<Type>%String</Type>
+<Type>APPS.VisiDot.impl.VHossCaptureHelper</Type>
 </Property>
 
 <Property name="WebService">
-<Type>%String</Type>
+<Type>WS.VisiDot.OperatorServer</Type>
 </Property>
 
-<Method name="Init">
-<Private>1</Private>
+<Method name="OnBeforeOneTest">
+<Description>
+Opzetten van de VHossBuilder</Description>
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()
-	Do QueueBuilder.Initialize()
+	
+	Set BatchID=99999
+	Set SlotLabel=0
+	Set TOENr=234567
+	Set KLNr=1239
+	Set SequenceNr=0
+	Set QueueList = "418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\"
+	Set QueueList = QueueList _"427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2"
+	
+	Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList)
 	Set BatchID=QueueBuilder.BuildBatch()
 	Set ..VHossBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture).%New(BatchID)
 	Set ..WebService = ##class(WS.VisiDot.OperatorServer).%New()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -41,7 +54,6 @@
 
 <Method name="TestZijkantCorrect">
 <Implementation><![CDATA[
-	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
 	;d Capture.XMLExport(,"literal,indent") r k
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
@@ -53,7 +65,7 @@
 
 <Method name="TestZijkantLadeFoutiefvak">
 <Implementation><![CDATA[
-	Do ..Init()
+	
 	Set Capture=..VHossBuilder.CorrectVHossLadeFout(1,1)
 	;d Capture.XMLExport(,"literal,indent") r k
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
@@ -65,7 +77,7 @@
 
 <Method name="TestZijkantPlusOne">
 <Implementation><![CDATA[
-	Do ..Init()
+	
 	Set Capture=..VHossBuilder.CorrectVHossPlusOne(1,1)
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 
@@ -76,7 +88,7 @@
 
 <Method name="TestZijkantMinusOne">
 <Implementation><![CDATA[
-	Do ..Init()
+	
 	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 
@@ -87,7 +99,7 @@
 
 <Method name="TestZijkantDubbel">
 <Implementation><![CDATA[
-	Do ..Init()
+	
 	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 	
@@ -102,7 +114,6 @@
 
 <Method name="TestZijkantZonderLade">
 <Implementation><![CDATA[
-	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 
@@ -113,7 +124,6 @@
 
 <Method name="TestZijkantZonderLadeMetBatch">
 <Implementation><![CDATA[
-	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
 	Do ..VHossBuilder.ZetBatchID()
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
@@ -125,7 +135,6 @@
 
 <Method name="TestEnd">
 <Implementation><![CDATA[
-	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 	Set Capture=..VHossBuilder.CorrectVHoss(2,1)
@@ -146,7 +155,6 @@
 
 <Method name="TestEndNotAllDone">
 <Implementation><![CDATA[
-	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
@@ -164,8 +172,6 @@
 
 <Method name="TestEndGeenBatchID">
 <Implementation><![CDATA[
-	Do ..Init()
-	
 	Set Capture=..VHossBuilder.Empty()
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
 	
Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(revision 1791)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.VisiDot.TestVHossXML">
+<Description>
+JBL - 2011-08-11
+Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot.TestVHossXML")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="DirUnitTestFiles">
+<Type>%String</Type>
+</Property>
+
+<Property name="CaptureHelper">
+<Type>APPS.VisiDot.impl.VHossCaptureHelper</Type>
+</Property>
+
+<Property name="WebService">
+<Type>WS.VisiDot.OperatorServer</Type>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set QueueBuilder = ##class(vhUnitTest.APPS.VisiDot.impl.BuildQueue).%New()	
+	Set BatchID=99999
+	Set SlotLabel=0
+	Set TOENr=234567
+	Set KLNr=1239
+	Set SequenceNr=0
+	Set QueueList = "418715;1;1.1\418582;1;1.1\418589;1;1.1\418582;2;1.1\"	
+	Set QueueList = QueueList_"418703;2;1.1\418589;2;1.1\418582;1;1.1\"
+	Set QueueList = QueueList_"418589;3;1.1\418703;2;1.1"
+	
+	Do QueueBuilder.Initialize(BatchID,SlotLabel,TOENr,KLNr,SequenceNr,QueueList)
+	Set BatchID=QueueBuilder.BuildBatch()
+	
+	Set ..WebService = ##class(WS.VisiDot.OperatorServer).%New()
+	Set ..DirUnitTestFiles = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GetString("UnitTestRoot"),"APPS.VisiDot")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Import">
+<FormalSpec>Dir,FileName</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.VisiDot.dto.CaptureInfo</ReturnType>
+<Implementation><![CDATA[
+	#include %occStatus	
+	
+	Set reader = ##class(%XML.Reader).%New()
+	// Begin processing of the XML input
+	Set Dir = ..DirUnitTestFiles_Dir
+	
+	set FullName = ##class(TECH.Files).AppendFile(Dir,FileName)
+	Set sc=reader.OpenFile(FullName)
+	
+	If $$$ISERR(sc)	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon XML bestand '"_FullName_"' niet openen : "_$$ParseStatus^vhLib(sc))) 
+
+	Do reader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo") ;Associate a class name with the XML element name
+	
+	Set result=reader.Next(.CaptureInfo,.sc)
+
+	If $$$ISERR(sc)	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon XML bestand '"_FullName_"' niet lezen : "_$$ParseStatus^vhLib(sc))) 
+	
+	Quit $G(CaptureInfo)
+]]></Implementation>
+</Method>
+
+<Method name="Finish">
+<FormalSpec>ProcessedData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..CaptureHelper=##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(ProcessedData)
+	Quit ..CaptureHelper.GeefFoutCode()
+]]></Implementation>
+</Method>
+
+<Method name="TestFullFirstPallet">
+<Implementation><![CDATA[
+	Set Dir = "01_FullFirstPallet\"
+	Set File = "ReadResults_ReadID00049264_Controller_Gate1_Status00_Time_20110721_170225_644_DUAL_(Stage_3_Before_DB_Insertion).xml"
+	Set CaptureInfo = ..Import(Dir, File)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set ErrorCode=..Finish(ProcessedData)	
+	//d ProcessedData.XMLExport(,"literal,indent") r k
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
+]]></Implementation>
+</Method>
+
+<Method name="TestMissingLabels">
+<Implementation><![CDATA[
+	Set Dir = "02_MissingLabels\"
+	Set File = "ReadResults_ReadID00049267_Controller_Gate1_Status00_Time_20110721_170704_972_DUAL_(Stage_3_Before_DB_Insertion).xml"
+	Set CaptureInfo = ..Import(Dir, File)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeOntbrekend(),"Capture bevat een ontbrekende lade")
+]]></Implementation>
+</Method>
+
+<Method name="TestReadAgain">
+<Implementation><![CDATA[
+	Set Dir = "03_ReadAgain\"
+	Set File = "ReadResults_ReadID00049269_Controller_Gate1_Status00_Time_20110721_170917_081_DUAL_(Stage_3_Before_DB_Insertion).xml"
+	Set CaptureInfo = ..Import(Dir, File)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set ErrorCode=..Finish(ProcessedData)
+]]></Implementation>
+</Method>
+
+<Method name="TestEndOrder">
+<Implementation><![CDATA[
+	Set Dir = "04_EndOrder\"
+	Set File = "END_ORDER_Time_2011_07_21_18_01_48.xml"
+	Set CaptureInfo = ..Import(Dir, File)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set ErrorCode=..Finish(ProcessedData)	
+	//d ProcessedData.XMLExport(,"literal,indent") r k
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"End Order was correct.")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/VisiDot/ControleurFactory.cls.xml
===================================================================
diff -u -r1717 -r1791
--- APPS/VisiDot/ControleurFactory.cls.xml	(.../ControleurFactory.cls.xml)	(revision 1717)
+++ APPS/VisiDot/ControleurFactory.cls.xml	(.../ControleurFactory.cls.xml)	(revision 1791)
@@ -13,7 +13,7 @@
 <Description>
 </Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>ActionType:%String,Data:APPS.VisiDot.dto.CaptureInfo</FormalSpec>
+<FormalSpec>ActionType:APPS.VisiDot.enu.ActionCodes,Data:APPS.VisiDot.dto.CaptureInfo</FormalSpec>
 <ReturnType>Controleur</ReturnType>
 <Implementation><![CDATA[
 	If ##class(APPS.VisiDot.impl.VHossControleurZijkant).IsVerwerker(ActionType,Data)
Index: APPS/VisiDot/enu/ActionCodes.cls.xml
===================================================================
diff -u -r1749 -r1791
--- APPS/VisiDot/enu/ActionCodes.cls.xml	(.../ActionCodes.cls.xml)	(revision 1749)
+++ APPS/VisiDot/enu/ActionCodes.cls.xml	(.../ActionCodes.cls.xml)	(revision 1791)
@@ -7,20 +7,23 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="VALUELIST">
-<Default>,READVHOSS,ENDVHOSS</Default>
+<Default>,READ,END_ORDER</Default>
 </Parameter>
 
 <Method name="VHossRead">
+<Description>
+JBL : TO DO/ASK : Beter met VHOSS in naam zetten !
+Indien er ander project ook via VisiDot wordt uitgewerkt meerdere reads/ends mogelijk.</Description>
 <ClassMethod>1</ClassMethod>
 <CodeMode>expression</CodeMode>
-<Implementation><![CDATA["READVHOSS"
+<Implementation><![CDATA["READ"
 ]]></Implementation>
 </Method>
 
 <Method name="VHossEnd">
 <ClassMethod>1</ClassMethod>
 <CodeMode>expression</CodeMode>
-<Implementation><![CDATA["ENDVHOSS"
+<Implementation><![CDATA["END_ORDER"
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/VisiDot/dto/ReadData.cls.xml
===================================================================
diff -u -r1774 -r1791
--- APPS/VisiDot/dto/ReadData.cls.xml	(.../ReadData.cls.xml)	(revision 1774)
+++ APPS/VisiDot/dto/ReadData.cls.xml	(.../ReadData.cls.xml)	(revision 1791)
@@ -17,6 +17,11 @@
 <Default>Read_Data</Default>
 </Parameter>
 
+<Parameter name="XMLIGNOREINVALIDTAG">
+<Type>BOOLEAN</Type>
+<Default>1</Default>
+</Parameter>
+
 <Property name="Name">
 <Type>%String</Type>
 <Parameter name="MAXLEN"/>
Index: APPS/VisiDot/impl/VHossControleurZijkant.cls.xml
===================================================================
diff -u -r1768 -r1791
--- APPS/VisiDot/impl/VHossControleurZijkant.cls.xml	(.../VHossControleurZijkant.cls.xml)	(revision 1768)
+++ APPS/VisiDot/impl/VHossControleurZijkant.cls.xml	(.../VHossControleurZijkant.cls.xml)	(revision 1791)
@@ -177,7 +177,7 @@
 <FormalSpec>DetectionHelper</FormalSpec>
 <Implementation><![CDATA[
 	;w DetectionHelper.GeefID()," ",DetectionHelper.GeefSlotNr(),!
-	Set BatchID=DetectionHelper.GeefBatchID()
+	Set BatchID=DetectionHelper.GeefBatchID()	
 	Set VHossVolgNr=DetectionHelper.GeefVHossVolgNr()
 	Set VHossZijkant=DetectionHelper.GeefVHossZijkant()
 	
@@ -196,9 +196,8 @@
 	{
 		Set ProductNr=DetectionHelper.GeefProduct()
 		Set VHossSlotNr=DetectionHelper.GeefSlotNr()
-		
+		//w !,"Controle aanwezig: QueueHelper : ",BatchID,",",VHossVolgNr,",",VHossZijkant,",",VHossSlotNr,",",ProductNr
 		Set QueueHelper=..ZoekQueueElement(BatchID,VHossVolgNr,VHossZijkant,VHossSlotNr,ProductNr)
-		
 		If $isObject(QueueHelper)
 		{
 			; extra info toevoegen
Index: vhUnitTest/APPS/VisiDot/impl/BuildQueue.cls.xml
===================================================================
diff -u -r1717 -r1791
--- vhUnitTest/APPS/VisiDot/impl/BuildQueue.cls.xml	(.../BuildQueue.cls.xml)	(revision 1717)
+++ vhUnitTest/APPS/VisiDot/impl/BuildQueue.cls.xml	(.../BuildQueue.cls.xml)	(revision 1791)
@@ -6,11 +6,11 @@
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Parameter name="QueueList">
+<Property name="QueueList">
 <Description>
 format PRNr;Aantal;VHOSS.Zijkant</Description>
-<Default>418581;3;1.1\418582;2;1.1\418588;4;1.1\418589;4;1.1\418609;5;1.1\418703;2;1.1\418704;1;1.1\418715;4;1.1\427384;5;2.1\427390;20;2.1\427394;1;2.1\427470;14;2.2\427478;2;2.2\460765;2;2.2</Default>
-</Parameter>
+<Type>%String</Type>
+</Property>
 
 <Property name="BatchID">
 <Type>%Integer</Type>
@@ -46,6 +46,7 @@
 </Property>
 
 <Method name="Initialize">
+<FormalSpec>BatchID:%Integer,SlotLabel:%Integer,TOENr:%Integer,KLNr:%Integer,SequenceNr:%Integer,QueueList:%String</FormalSpec>
 <Implementation><![CDATA[
 
 	Set ..BatchID=99999
@@ -54,13 +55,14 @@
 	Set ..TOENr=234567
 	Set ..KLNr=1239
 	Set ..SequenceNr=0
+	Set ..QueueList = QueueList
 	Do ..DeleteBatch()
 ]]></Implementation>
 </Method>
 
 <Method name="BuildBatch">
 <Implementation><![CDATA[
-	Set QueueList=..#QueueList
+	Set QueueList=..QueueList
 	For I=1:1:$L(QueueList,"\") 
 	{
 		Set PRNr=$P($P(QueueList,"\",I),";",1)
Index: PV VisiDot.prj.xml
===================================================================
diff -u -r1717 -r1791
--- PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 1717)
+++ PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 1791)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="PV VisiDot" LastModified="2011-07-22 17:12:09">
+<Project name="PV VisiDot" LastModified="2011-08-11 15:18:18">
   <Items>
     <ProjectItem name="APPS.Halux.common.BatchService" type="CLS"/>
     <ProjectItem name="APPS.Halux.common.impl.BatchImpl" type="CLS"/>
@@ -16,6 +16,8 @@
     <ProjectItem name="APPS.VisiDot.dto.Director" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.ERP" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.ErrorMessage" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.dto.GUI" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.dto.JB" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.Photo" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.ReadData" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.ReadStage" type="CLS"/>
@@ -24,8 +26,12 @@
     <ProjectItem name="APPS.VisiDot.dto.Sequence" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.StatusLight" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.dto.VRRead" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.enu.ActionCodes" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.enu.DetectionKleur" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.enu.DetectionTypes" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.enu.FoutCodes" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.enu.FoutTypes" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.enu.ResultCodes" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.CaptureHelper" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.DetectionHelper" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.DetectionIterator" type="CLS"/>
@@ -38,13 +44,15 @@
     <ProjectItem name="APPS.VisiDot.impl.VHossLadeDetectionHelper" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.VHossLadeIterator" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.VHossProductionHelper" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.impl.VHossSlotDetectionHelper" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.zTryout" type="CLS"/>
     <ProjectItem name="DS.PPS.TBX.Queue" type="CLS"/>
     <ProjectItem name="DS.PPS.TBX.sub.emWPVerpak" type="CLS"/>
     <ProjectItem name="WS.VisiDot.OperatorServer" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHoss" type="CLS"/>
-    <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildCapture" type="CLS"/>
+    <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHossXML" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildQueue" type="CLS"/>
+    <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture" type="CLS"/>
   </Items>
 </Project>
 </Export>
Index: APPS/VisiDot/dto/GUI.cls.xml
===================================================================
diff -u
--- APPS/VisiDot/dto/GUI.cls.xml	(revision 0)
+++ APPS/VisiDot/dto/GUI.cls.xml	(revision 1791)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.VisiDot.dto.GUI">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="XMLNAME">
+<Default>GUI</Default>
+</Parameter>
+
+<Parameter name="XMLSEQUENCE">
+<Default>1</Default>
+</Parameter>
+</Class>
+</Export>
Index: WS/VisiDot/OperatorServer.cls.xml
===================================================================
diff -u -r1756 -r1791
--- WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1756)
+++ WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1791)
@@ -3,7 +3,7 @@
 <Class name="WS.VisiDot.OperatorServer">
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebService</Super>
+<Super>WS.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="SERVICENAME">
Index: APPS/VisiDot/dto/Coordinate.cls.xml
===================================================================
diff -u -r1717 -r1791
--- APPS/VisiDot/dto/Coordinate.cls.xml	(.../Coordinate.cls.xml)	(revision 1717)
+++ APPS/VisiDot/dto/Coordinate.cls.xml	(.../Coordinate.cls.xml)	(revision 1791)
@@ -5,6 +5,7 @@
 Created from: c:/stage4.xsd</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="XMLNAME">
 <Default>Coordinate</Default>