Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u -r1847 -r1861
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 1847)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 1861)
@@ -5,21 +5,9 @@
 JBL - 2011-08-11
 Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot.TestVHossXML")</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.APPS.VisiDot.VHossTestCase</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>
@@ -62,73 +50,27 @@
 	
 	Set result=reader.Next(.CaptureInfo,.sc)
 	
-	/*
-	
-	Om test data te krijgen met HTML entities 
-	
-	Set XML = ""
-	Do CaptureInfo.XMLExportToString(.XML,,"literal")
-	
-	//Set FullXMLStream = ##class(%GlobalCharacterStream).%New()
-	Set FullXMLStream=##class(%FileCharacterStream).%New()
-	Set FullXMLStream.Filename="c:\myfile.txt"
-	
-	Set Buffer = 10000
-	Set AantalChars = $Length(XML)
-	For i = 1 : 1 : ((AantalChars/Buffer)+1) {
-		Set XMLPart = $EXTRACT(XML,((i-1)*Buffer)+1,(i*Buffer))		
-		set ^XML = XMLPart
-		w !,i
-		Do FullXMLStream.Write($ZCVT(XMLPart,"O","HTML"))
-		//Do FullXMLStream.Write(XMLPart)
-	}
-	Do FullXMLStream.Flush()
-	Do FullXMLStream.SaveStream()
-	Do FullXMLStream.%Close()
-	
-	/*
-	Set FullXMLStream=##class(%FileCharacterStream).%New()
-	Set FullXMLStream.Filename="c:\myfile.txt"
-	Set LijnNr = 1
-	While 'FullXMLStream.AtEnd {
-		Set line=FullXMLStream.ReadLine()
-		set ^Line = line
-		w "Lijn:",LijnNr,!
-		Set LijnNr = LijnNr + 1
-	}
-	
-	Set reader = ##class(%XML.Reader).%New()
-	Set sc=reader.OpenStream(FullXMLStream)
-	If $$$ISERR(sc) w !,"ERROR : "_$$ParseStatus^vhLib(sc),! Quit  
-	Do reader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo")
-	While reader.Next(.CaptureInfo,.sc) {
-		//w !,"Yep",!
-	}
-	
-	
 	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="TestUnmarshallingXML">
 <Implementation><![CDATA[
 	Set Dir = "Stage2_NormalRead_AllOk\"
 	Set File = "ReadResults_ReadID00000182_Controller_Gate1_Status00_Time_20110814_153423_890_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 Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
+	
 	Set ErrorCode=..Finish(ProcessedData)	
 	
+	Set XMLReader = ##class(%XML.Reader).%New()
+	Do XMLReader.OpenStream(ProcessedData)
+	Do XMLReader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo") 	
+	Do XMLReader.Next(.ProcessedData,.sc) 
+	
 	/// Correctheid van data nakijken
 	Do $$$AssertTrue($IsObject(ProcessedData.VRRead),"VHRead is een object.")
 	
@@ -204,54 +146,56 @@
 	Set Dir = "Stage2_NormalRead_AllOk\"
 	Set File = "ReadResults_ReadID00000182_Controller_Gate1_Status00_Time_20110814_153423_890_DUAL_(Stage_3_Before_DB_Insertion).xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	
 	D ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)
 	
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set ErrorCode=..Finish(ProcessedData)	
-	d ProcessedData.XMLExport(,"literal,indent") 
+	//d ProcessedData.XMLExport(,"literal,indent") 
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method TestMissingLabels()
-{
+<Method name="TestMissingLabels">
+<Implementation><![CDATA[
 	Set Dir = "Stage3_MissingLabel\"
 	Set File = "ReadResults_ReadID00000183_Controller_Gate1_Status00_Time_20110814_153456_593_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 Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	w !,"Missing labels : ",!
 	D ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekend(),"Capture bevat een ontbrekende lade")
-}
+]]></Implementation>
+</Method>
 
-Method TestReadAgain()
-{
+<Method name="TestReadAgain">
+<Implementation><![CDATA[
 	Set Dir = "Stage4_ReadAgain\"
 	Set File = "ReadResults_ReadID00000184_Controller_Gate1_Status00_Time_20110814_153651_906_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 Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set ErrorCode=..Finish(ProcessedData)
-}
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
+]]></Implementation>
+</Method>
 
-Method TestEndOrder()
-{
+<Method name="TestEndOrder">
+<Implementation><![CDATA[
 	Set Dir = "Stage5_EndOrder\"
 	Set File = "END_ORDER_Time_2011_08_14_15_37_57_To_ERP.xml"
 	Set CaptureInfo = ..Import(Dir, File)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfo, .ResultDesc, .ProcessedData)
+	Set Status = CaptureInfo.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfoStream, .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.")
-}
-*/
-]]></Content>
-</UDLText>
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/VisiDot/dto/Detection.cls.xml
===================================================================
diff -u -r1839 -r1861
--- APPS/VisiDot/dto/Detection.cls.xml	(.../Detection.cls.xml)	(revision 1839)
+++ APPS/VisiDot/dto/Detection.cls.xml	(.../Detection.cls.xml)	(revision 1861)
@@ -44,11 +44,11 @@
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
-<Property name="ReadData">
+<Property name="AssetData">
 <Type>APPS.VisiDot.dto.ReadData</Type>
 <Collection>list</Collection>
 <Parameter name="XMLELEMENTREF" value="1"/>
-<Parameter name="XMLNAME" value="Read_Data"/>
+<Parameter name="XMLNAME" value="Asset_Data"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
Index: WS/VisiDot/OperatorServer.cls.xml
===================================================================
diff -u -r1847 -r1861
--- WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1847)
+++ WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1861)
@@ -49,14 +49,18 @@
 <Method name="UpdateData">
 <Description>
 </Description>
-<FormalSpec><![CDATA[ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:%String(XMLNAME="Capture_Info"),&ResultDesc:%String,&ProcessedData:%GlobalCharacterStream]]></FormalSpec>
+<FormalSpec><![CDATA[ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:%GlobalCharacterStream(XMLNAME="Capture_Info"),&ResultDesc:%String,&ProcessedData:%GlobalCharacterStream]]></FormalSpec>
+<ReturnType>%Integer</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
 	Set ProcessedData = ##class(%GlobalCharacterStream).%New()
 	Set ComputerNaam = ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()
-	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("CaptureInfo IN", "["_ComputerNaam_"] "_ActionType_" -> "_CaptureInfo)
 	
+    Set CaptureString = CaptureInfo.Read(32000)
+    Do CaptureInfo.Rewind()
+	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("CaptureInfo IN", "["_ComputerNaam_"] "_ActionType_" -> "_CaptureString)
+	
 	/*
  	Set String = CaptureInfo
 	Set Prefix = "&"
@@ -75,7 +79,7 @@
 	}
 	*/		
 	Set XMLReader = ##class(%XML.Reader).%New()
-	Do XMLReader.OpenString(CaptureInfo)
+	Do XMLReader.OpenStream(CaptureInfo)
 	Do XMLReader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo") 
 	
 	Set CorrelatedCaptureInfo = ""
@@ -89,19 +93,27 @@
 	Do ..Controleur.UpdateData(.ResultDesc,.ProcessedDataObject)
 	
 	/// XML-object omzetten naar Stream
-	Set ProcessedDataStream = ##class(%GlobalCharacterStream).%New()
-	Set Status = ProcessedDataObject.XMLExportToStream(ProcessedDataStream,,"literal")
+	Set ProcessedData = ##class(%GlobalCharacterStream).%New()
+	Set Status = ProcessedDataObject.XMLExportToStream(ProcessedData,,"literal,indent")
 	
+	/*
 	/// In stream HTML Entities omzetten
 	While (ProcessedDataStream.AtEnd = 0) {
         Set Data = ProcessedDataStream.Read(10000)
         Set Data = ##class(TECH.StringUtils).HTMLEntities(Data)
         Do ProcessedData.Write(Data)
     }
-    Do ProcessedData.Flush()	
+    Do ProcessedData.Flush()
+    */
+    
+    Set ProcesseDataString = ProcessedData.Read(32000)
+    Do ProcessedData.Rewind()
+	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("ProcessedData OUT", "["_ComputerNaam_"] "_ActionType_" -> "_ProcesseDataString)	
 	
+	Kill CorrelatedCaptureInfo
+	
 	$$$TECHErrorTrapOff
-	Quit
+	Quit 0
 ]]></Implementation>
 </Method>
 
Index: APPS/VisiDot/zTryout.cls.xml
===================================================================
diff -u -r1808 -r1861
--- APPS/VisiDot/zTryout.cls.xml	(.../zTryout.cls.xml)	(revision 1808)
+++ APPS/VisiDot/zTryout.cls.xml	(.../zTryout.cls.xml)	(revision 1861)
@@ -125,13 +125,6 @@
 d ##class(APPS.VisiDot.zTryout).%New().ShowVHoss(CaptureInfo)</Description>
 <FormalSpec>CaptureInfo:APPS.VisiDot.dto.CaptureInfo</FormalSpec>
 <Implementation><![CDATA[
-	Set WebService = ##class(WS.VisiDot.OperatorServer).%New()
-	Do WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfo, .ResultDesc, .ProcessedData)
-	
-	Set ErrorCode=..Finish(ProcessedData)	
-	
-	Set VRRead = ProcessedData.VRRead.GetAt(1)
-
 	Set VHoss(1,1) = ""
 	
 	Set DetIt = ##class(APPS.VisiDot.impl.DetectionIterator).%New(CaptureInfo)
Index: APPS/VisiDot/impl/Tech.cls.xml
===================================================================
diff -u -r1839 -r1861
--- APPS/VisiDot/impl/Tech.cls.xml	(.../Tech.cls.xml)	(revision 1839)
+++ APPS/VisiDot/impl/Tech.cls.xml	(.../Tech.cls.xml)	(revision 1861)
@@ -38,7 +38,7 @@
 		Set ReadData=##class(APPS.VisiDot.dto.ReadData).%New()
 		Set ReadData.Name=Sleutel
 		Set ReadData.Value=Waarde
-		Set:(BewaarVoorHergebruik'=0) ReadData.Preserved=BewaarVoorHergebruik
+		Set:(BewaarVoorHergebruik=1) ReadData.Preserved="TRUE"
 		Do List.Insert(ReadData)
 	}
 ]]></Implementation>
Index: APPS/VisiDot/impl/VHossCaptureHelper.cls.xml
===================================================================
diff -u -r1839 -r1861
--- APPS/VisiDot/impl/VHossCaptureHelper.cls.xml	(.../VHossCaptureHelper.cls.xml)	(revision 1839)
+++ APPS/VisiDot/impl/VHossCaptureHelper.cls.xml	(.../VHossCaptureHelper.cls.xml)	(revision 1861)
@@ -94,21 +94,22 @@
 </Method>
 
 <Method name="GeefBatchID">
+<Description><![CDATA[
+Amiram Sella" <Amiram.Sella@imageid.zetes.com> 
+The ReadData of BatchID you return to me is put in two nodes, one under the Director node, and the other under the ERP node.
+Your system should add Read_Data only to the ERP node, and the Visidot system should add data only to the Director node.]]></Description>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 	
-	//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")
+	Set BatchID = ..GeefERPSleutelWaarde("BatchID")
+	Set:(BatchID = "") BatchID = ..GeefDirectorSleutelWaarde("BatchID")
+	Quit BatchID
 ]]></Implementation>
 </Method>
 
 <Method name="ZetBatchID">
 <FormalSpec>BatchID</FormalSpec>
-<Implementation><![CDATA[
-	Do ..ZetERPSleutelWaarde("BatchID",BatchID,1)
-	Do ..ZetDirectorSleutelWaarde("BatchID",BatchID,1)
+<Implementation><![CDATA[	Do ..ZetERPSleutelWaarde("BatchID",BatchID,1)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VisiDot/TestDetectionHelper.cls.xml
===================================================================
diff -u -r1839 -r1861
--- vhUnitTest/APPS/VisiDot/TestDetectionHelper.cls.xml	(.../TestDetectionHelper.cls.xml)	(revision 1839)
+++ vhUnitTest/APPS/VisiDot/TestDetectionHelper.cls.xml	(.../TestDetectionHelper.cls.xml)	(revision 1861)
@@ -76,9 +76,9 @@
 	
 	Set Detection = DetectionHelper.GeefData()
 	
-	Set ReadData = Detection.ReadData.GetAt(1)
-	Do $$$AssertEquals(ReadData.Name,Sleutel,"Sleutel is correct.")
-	Do $$$AssertEquals(ReadData.Value,Waarde,"Waarde is correct.")
+	Set AssetData = Detection.AssetData.GetAt(1)
+	Do $$$AssertEquals(AssetData.Name,Sleutel,"Sleutel is correct.")
+	Do $$$AssertEquals(AssetData.Value,Waarde,"Waarde is correct.")
 ]]></Implementation>
 </Method>
 
Index: PV VisiDot.prj.xml
===================================================================
diff -u -r1839 -r1861
--- PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 1839)
+++ PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 1861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="PV VisiDot" LastModified="2011-08-19 15:59:55">
+<Project name="PV VisiDot" LastModified="2011-08-24 08:54:33">
   <Items>
     <ProjectItem name="APPS.Halux.common.BatchService" type="CLS"/>
     <ProjectItem name="APPS.Halux.common.impl.BatchImpl" type="CLS"/>
@@ -56,6 +56,7 @@
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHoss" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHossCaptureHelper" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.TestVHossXML" type="CLS"/>
+    <ProjectItem name="vhUnitTest.APPS.VisiDot.VHossTestCase" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildQueue" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture" type="CLS"/>
   </Items>
Index: vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml
===================================================================
diff -u -r1812 -r1861
--- vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1812)
+++ vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1861)
@@ -4,21 +4,13 @@
 <Description>
 do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.VisiDot")</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.APPS.VisiDot.VHossTestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="VHossBuilder">
 <Type>vhUnitTest.APPS.VisiDot.impl.BuildVHossCapture</Type>
 </Property>
 
-<Property name="CaptureHelper">
-<Type>APPS.VisiDot.impl.VHossCaptureHelper</Type>
-</Property>
-
-<Property name="WebService">
-<Type>WS.VisiDot.OperatorServer</Type>
-</Property>
-
 <Method name="OnBeforeOneTest">
 <Description>
 Opzetten van de VHossBuilder</Description>
@@ -43,20 +35,12 @@
 ]]></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="TestZijkantCorrect">
 <Implementation><![CDATA[
 	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)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
@@ -68,7 +52,8 @@
 	
 	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)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossNoInfo(),"Capture bevat een lade in een foutief vak")
@@ -79,7 +64,8 @@
 <Implementation><![CDATA[
 	
 	Set Capture=..VHossBuilder.CorrectVHossPlusOne(1,1)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossLadeFoutief(),"Capture bevat een extra lade (teveel)")
@@ -90,7 +76,8 @@
 <Implementation><![CDATA[
 	
 	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekend(),"Capture bevat een ontbrekende lade")
@@ -101,11 +88,13 @@
 <Implementation><![CDATA[
 	
 	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture wordt voor een tweede keer ingelezen en is dan correct")
@@ -115,7 +104,8 @@
 <Method name="TestZijkantZonderLade">
 <Implementation><![CDATA[
 	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenBatchID(),"Lege foto zonder Frame en Batch gegevens")
@@ -126,7 +116,8 @@
 <Implementation><![CDATA[
 	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenLaden(),"Lege foto zonder Frame en Batch gegevens")
@@ -136,17 +127,21 @@
 <Method name="TestEnd">
 <Implementation><![CDATA[
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set Capture=..VHossBuilder.CorrectVHoss(2,1)
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set Capture=..VHossBuilder.Empty()
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Alle queue elementen van de batch hebben frameIDs")
@@ -156,14 +151,17 @@
 <Method name="TestEndNotAllDone">
 <Implementation><![CDATA[
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set Capture=..VHossBuilder.Empty()
 	Do ..VHossBuilder.ZetBatchID()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekendeFrame(),"1 ontbrekend frame want 1 zijkant is niet gescanned geworden")
@@ -173,7 +171,8 @@
 <Method name="TestEndGeenBatchID">
 <Implementation><![CDATA[
 	Set Capture=..VHossBuilder.Empty()
-	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
+	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenBatchID(),"Er mag geen batchID gekend zijn")
Index: APPS/VisiDot/impl/VHossSlotDetectionHelper.cls.xml
===================================================================
diff -u -r1839 -r1861
--- APPS/VisiDot/impl/VHossSlotDetectionHelper.cls.xml	(.../VHossSlotDetectionHelper.cls.xml)	(revision 1839)
+++ APPS/VisiDot/impl/VHossSlotDetectionHelper.cls.xml	(.../VHossSlotDetectionHelper.cls.xml)	(revision 1861)
@@ -24,6 +24,12 @@
 		Do ..ZetData("Toelevering",Toelevering)
 		Do ..ZetData("Dossier",Dossier)
 		Do ..ZetData("Omschrijving",Omschrijving)
+		
+		Set TekstToolTip = "Toelevering: "_Toelevering
+		Set TekstToolTip = TekstToolTip_"; Dossier: "_Dossier
+		Set TekstToolTip = TekstToolTip_"; Omschrijving: "_Omschrijving
+		
+		Do ..ZetToolTip(TekstToolTip)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/VisiDot/VHossTestCase.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VisiDot/VHossTestCase.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VisiDot/VHossTestCase.cls.xml	(revision 1861)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.VisiDot.VHossTestCase">
+<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="Finish">
+<FormalSpec>ProcessedData:%GlobalCharacterStream</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set XMLReader = ##class(%XML.Reader).%New()
+	Do XMLReader.OpenStream(ProcessedData)
+	Do XMLReader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo") 
+	
+	Set CorrelateProcessedData = ""
+	Do XMLReader.Next(.CorrelateProcessedData,.sc) 
+	
+	Set ..CaptureHelper=##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(CorrelateProcessedData)
+	Quit ..CaptureHelper.GeefFoutCode()
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/VisiDot/impl/DetectionHelper.cls.xml
===================================================================
diff -u -r1839 -r1861
--- APPS/VisiDot/impl/DetectionHelper.cls.xml	(.../DetectionHelper.cls.xml)	(revision 1839)
+++ APPS/VisiDot/impl/DetectionHelper.cls.xml	(.../DetectionHelper.cls.xml)	(revision 1861)
@@ -39,21 +39,30 @@
 </Method>
 
 <Method name="ZetStatus">
-<FormalSpec>Kleur:APPS.VisiDot.enu.DetectionKleur,ToolTip:%String</FormalSpec>
+<FormalSpec>Kleur:APPS.VisiDot.enu.DetectionKleur,ToolTip:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..Detection.Color=Kleur
-	Set ..Detection.ToolTip=$G(ToolTip)
+	If ToolTip '= "" {
+		Do ..ZetToolTip(ToolTip)
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="ZetData">
 <FormalSpec>Sleutel:%String,Waarde:%String</FormalSpec>
 <Implementation><![CDATA[
-	Set:'$isObject(..Detection.ReadData) ..Detection.ReadData=##class(%ListOfObject).%New()
-	Do ##class(APPS.VisiDot.impl.Tech).AddSleutelWaarde(..Detection.ReadData,Sleutel,Waarde)
+	Set:'$isObject(..Detection.AssetData) ..Detection.AssetData=##class(%ListOfObject).%New()
+	Do ##class(APPS.VisiDot.impl.Tech).AddSleutelWaarde(..Detection.AssetData,Sleutel,Waarde)
 ]]></Implementation>
 </Method>
 
+<Method name="ZetToolTip">
+<FormalSpec>ToolTip:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..Detection.ToolTip=ToolTip
+]]></Implementation>
+</Method>
+
 <Method name="Object2String">
 <Implementation><![CDATA[	Quit ..Detection.Id
 ]]></Implementation>