Index: WS/VisiDot/OperatorServer.cls.xml
===================================================================
diff -u -r1839 -r1847
--- WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1839)
+++ WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1847)
@@ -16,27 +16,7 @@
 <Default>http://www.imageid.zetes.com/OperatorWS/V1</Default>
 </Parameter>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Parameter CHARSET = "utf-8";
-
-Parameter CONTENTTYPE = "application/soap+xml"; 
-*/
-]]></Content>
-</UDLText>
-
-<UDLText name="T">
-<Content><![CDATA[
-//"text/xml";
-
-]]></Content>
-</UDLText>
-
 <Property name="Controleur">
-<Description>
-Parameter XMLTYPE = "Action";
-Parameter WSADDRESSING = "AUTO";</Description>
 <Type>APPS.VisiDot.Controleur</Type>
 <Private>1</Private>
 </Property>
@@ -69,18 +49,59 @@
 <Method name="UpdateData">
 <Description>
 </Description>
-<FormalSpec><![CDATA[ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:APPS.VisiDot.dto.CaptureInfo(XMLNAME="Capture_Info"),&ResultDesc:%String,&ProcessedData:APPS.VisiDot.dto.CaptureInfo]]></FormalSpec>
+<FormalSpec><![CDATA[ActionType:APPS.VisiDot.enu.ActionCodes,CaptureInfo:%String(XMLNAME="Capture_Info"),&ResultDesc:%String,&ProcessedData:%GlobalCharacterStream]]></FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
+	Set ProcessedData = ##class(%GlobalCharacterStream).%New()
 	Set ComputerNaam = ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()
-	Set XML = ""
-	Do CaptureInfo.XMLExportToString(.XML,,"literal")
-	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("CaptureInfo IN", "["_ComputerNaam_"] "_ActionType_" -> "_XML)
+	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("CaptureInfo IN", "["_ComputerNaam_"] "_ActionType_" -> "_CaptureInfo)
 	
-	Do ..GeefControleur(ActionType,CaptureInfo)
-	Do ..Controleur.UpdateData(.ResultDesc,.ProcessedData)
+	/*
+ 	Set String = CaptureInfo
+	Set Prefix = "&"
+	Set Suffix = ";"
+	Set Aantal = $Length(String,Prefix)
+	Set Find = 1
+	For i = 1:1:Aantal-1
+	{
+		Set Gevonden = $Piece($Piece($Extract(String,Find,$Length(String)),Prefix,2),Suffix)
+		Set Find = $Find(String,Prefix,Find)
+		If ($Extract(String,Find+$Length(Gevonden),Find+$Length(Gevonden)) = Suffix)
+		{
+			Set Found = $Extract(String,Find,Find+$Length(Gevonden)-1)
+			Set $Extract(String,Find,Find+$Length(Gevonden)-1) = ##class(TECH.StringUtils).HTMLEntities(Found)
+		}
+	}
+	*/		
+	Set XMLReader = ##class(%XML.Reader).%New()
+	Do XMLReader.OpenString(CaptureInfo)
+	Do XMLReader.Correlate("Capture_Info","APPS.VisiDot.dto.CaptureInfo") 
+	
+	Set CorrelatedCaptureInfo = ""
+	Do XMLReader.Next(.CorrelatedCaptureInfo,.sc)
+	If $$$ISERR(sc)	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon Capture_Info niet lezen (Correlate gefaald) : "_$$ParseStatus^vhLib(sc))) 
+	If ('$IsObject(CorrelatedCaptureInfo)) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Kon Capture_Info niet omzetten naar een object : "_$$ParseStatus^vhLib(sc))) 
+	
+	Set ProcessedDataObject = ##class(APPS.VisiDot.dto.CaptureInfo).%New()
+	
+	Do ..GeefControleur(ActionType,CorrelatedCaptureInfo)
+	Do ..Controleur.UpdateData(.ResultDesc,.ProcessedDataObject)
+	
+	/// XML-object omzetten naar Stream
+	Set ProcessedDataStream = ##class(%GlobalCharacterStream).%New()
+	Set Status = ProcessedDataObject.XMLExportToStream(ProcessedDataStream,,"literal")
+	
+	/// 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()	
+	
 	$$$TECHErrorTrapOff
+	Quit
 ]]></Implementation>
 </Method>