Index: PV VisiDot.prj.xml
===================================================================
diff -u -r2047 -r2104
--- PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 2047)
+++ PV VisiDot.prj.xml	(.../PV VisiDot.prj.xml)	(revision 2104)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="PV VisiDot" LastModified="2011-09-12 16:55:02">
+<Project name="PV VisiDot" LastModified="2011-09-16 10:31:37">
   <Items>
     <ProjectItem name="APPS.Halux.common.BatchService" type="CLS"/>
     <ProjectItem name="APPS.Halux.common.impl.BatchImpl" type="CLS"/>
@@ -37,6 +37,7 @@
     <ProjectItem name="APPS.VisiDot.enu.ResultCodes" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.enu.Zijkant" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.CaptureHelper" type="CLS"/>
+    <ProjectItem name="APPS.VisiDot.impl.CleanUp" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.DetectionHelper" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.DetectionIterator" type="CLS"/>
     <ProjectItem name="APPS.VisiDot.impl.EndAfhandelaar" type="CLS"/>
Index: APPS/VisiDot/impl/VHossControleurZijkant.cls.xml
===================================================================
diff -u -r2091 -r2104
--- APPS/VisiDot/impl/VHossControleurZijkant.cls.xml	(.../VHossControleurZijkant.cls.xml)	(revision 2091)
+++ APPS/VisiDot/impl/VHossControleurZijkant.cls.xml	(.../VHossControleurZijkant.cls.xml)	(revision 2104)
@@ -75,7 +75,7 @@
 	}	
 	
 	/// Opslaan van binnenkomende data in de juiste directory
-	Set BestandNaam = "CaptureInfo_IN"_$tr($h,",")_".xml"
+	Set BestandNaam = "CaptureInfo_IN_"_$tr($h,",")_".xml"
 	//Set BestandNaam = "CaptureInfo_IN.xml"
 	Set VHossSequentie = ##class(APPS.VisiDot.impl.VHossCaptureHelper).MaakVHossSequentie(..VHossVolgNr,..VHossZijkant)
 	Set BestandNaam = VHossSequentie_"_"_BestandNaam
@@ -174,7 +174,7 @@
 	Set Info = "Er ontbreken laden in volgende vakken : "_LegeSlots
 	/// JBL uitgecommentarieerd, anders een popup !
 	//Do ..CaptureHelper.ZetError(##class(APPS.VisiDot.enu.FoutTypes).Waarschuwing(),"Ontbrekende laden",Info)
-	If (^JBL.VisiDot.SlotControle){
+	If ($G(^JBL.VisiDot.SlotControle)){
 		Do ..CaptureHelper.ZetGebruikersInfo(Info)
 		Do ..CaptureHelper.ZetFoutCode(##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekend())
 	}
@@ -195,9 +195,6 @@
 <Method name="ControleAanwezigeLade">
 <FormalSpec>DetectionHelper</FormalSpec>
 <Implementation><![CDATA[
-	
-	d WLIP^vhDBG(127,"-----------------------------")
-	;w DetectionHelper.GeefID()," ",DetectionHelper.GeefSlotNr(),!
 	Set BatchID=DetectionHelper.GeefBatchID()	
 	Set VHossVolgNr=DetectionHelper.GeefVHossVolgNr()
 	Set VHossZijkant=DetectionHelper.GeefVHossZijkant()
@@ -249,7 +246,7 @@
 		}
 		Else
 		{
-			If (^JBL.VisiDot.SlotControle){
+			If ($G(^JBL.VisiDot.SlotControle)){
 				//d WLIP^vhDBG(127,"Controle aanwezig: QueueHelper : BatchID:"_BatchID_",VolgNr:"_VHossVolgNr)
 				//d WLIP^vhDBG(127,",Zijkant:"_VHossZijkant_",SlotNr:"_VHossSlotNr_",PRNr:"_ProductNr)
 				Set ExtraInfo = ""
Index: APPS/VisiDot/Afhandelaar.cls.xml
===================================================================
diff -u -r2047 -r2104
--- APPS/VisiDot/Afhandelaar.cls.xml	(.../Afhandelaar.cls.xml)	(revision 2047)
+++ APPS/VisiDot/Afhandelaar.cls.xml	(.../Afhandelaar.cls.xml)	(revision 2104)
@@ -29,11 +29,13 @@
 <Implementation><![CDATA[
 	Set Locatie = ..GeefDoelLocatie(ProcessedData)
 	Do ##class(%File).CreateDirectoryChain(Locatie)
-	Set BestandLocatie = ##class(TECH.Files).AppendFile(Locatie,BestandNaam)
-	OPEN BestandLocatie:("NW"):1
-	Use BestandLocatie
-	Do ProcessedData.XMLExport(,"literal,indent")
-	CLOSE BestandLocatie
+	Set DoelLocatie = ##class(TECH.Files).AppendFile(Locatie,BestandNaam)
+	Set FileStream = ##class(%FileCharacterStream).%New()
+	Do ProcessedData.XMLExportToStream(.FileStream,"","literal,indent")
+	Do FileStream.SaveStream()
+	Set Status = ##class(%File).Rename(FileStream.Filename,DoelLocatie)
+	If ($$$ISERR(Status)) Do ##class(vhLib.Logger).%New("APPS.VisiDot").ErrorMail("BewaarData", "Kon data van webservice niet opslaan naar bestand '"_DoelLocatie_"'")
+	Set FileStream = ""
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/Files.cls.xml
===================================================================
diff -u -r2047 -r2104
--- TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 2047)
+++ TECH/Files.cls.xml	(.../Files.cls.xml)	(revision 2104)
@@ -156,5 +156,18 @@
 	If $$$ERROR(Status) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.FileException).%New("Kon bestand niet kopieren van "_FromPath_" naar "_ToPath,Status))
 ]]></Implementation>
 </Method>
+
+<Method name="JobCopyFile">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BestandLocatie:%String,DoelLocatie:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set $ZTRAP = "Catch"
+	Do ##class(TECH.Files).CopyFile(BestandLocatie,DoelLocatie)
+	Quit 
+Catch Set $ZTRAP = ""
+	Do ##class(vhLib.Logger).%New("TECH.Files").Error("JobCopyFile","Kon bestand "_BestandLocatie_" niet kopieren naar "_DoelLocatie)
+	Quit
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: WS/VisiDot/OperatorServer.cls.xml
===================================================================
diff -u -r1866 -r2104
--- WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 1866)
+++ WS/VisiDot/OperatorServer.cls.xml	(.../OperatorServer.cls.xml)	(revision 2104)
@@ -57,7 +57,7 @@
 	Set ProcessedData = ##class(%GlobalCharacterStream).%New()
 	Set ComputerNaam = ##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()
 	
-    Set CaptureString = CaptureInfo.Read(32000)
+    Set CaptureString = CaptureInfo.Read(300)
     Do CaptureInfo.Rewind()
 	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("CaptureInfo IN", "["_ComputerNaam_"] "_ActionType_" -> "_CaptureString)
 		
@@ -92,7 +92,7 @@
     Do ProcessedData.Flush()
     
     
-    Set ProcesseDataString = ProcessedData.Read(32000)
+    Set ProcesseDataString = ProcessedData.Read(300)
     Do ProcessedData.Rewind()
 	Do ##class(vhLib.Logger).%New("WS.VisiDot").Info("ProcessedData OUT", "["_ComputerNaam_"] "_ActionType_" -> "_ProcesseDataString)	
 	
Index: BL/PPS/TBX/DocsProPlus.cls.xml
===================================================================
diff -u -r2091 -r2104
--- BL/PPS/TBX/DocsProPlus.cls.xml	(.../DocsProPlus.cls.xml)	(revision 2091)
+++ BL/PPS/TBX/DocsProPlus.cls.xml	(.../DocsProPlus.cls.xml)	(revision 2104)
@@ -117,11 +117,11 @@
 	
 	If Opties["D" Do   ; Print and Save as PDF-file
 	. Set sc=..VHossDocs()
-	. Do WL^vhDBG("Status VHossDocs: "_$$ParseStatus^vhLib(sc))
+	;. Do WL^vhDBG("Status VHossDocs: "_$$ParseStatus^vhLib(sc))
 	. Set sc=..VHossDocsToFile() 
-	. Do WL^vhDBG("Status VHossDocs: "_$$ParseStatus^vhLib(sc))
+	;. Do WL^vhDBG("Status VHossDocs: "_$$ParseStatus^vhLib(sc))
 	. Set sc=..VHossXMLToFile() 
-	. Do WL^vhDBG("Status VHossDocs: "_$$ParseStatus^vhLib(sc))
+	;. Do WL^vhDBG("Status VHossDocs: "_$$ParseStatus^vhLib(sc))
 	;update in batch
 	Set PrintLijstInfo = ##class(BL.PPS.TBX.PrintLijstInfo).GeefPrintLijstInfo(..BatchID)
 	Set PrintList=PrintLijstInfo.PrintLijst
@@ -928,21 +928,17 @@
 	Set sc=##class(BL.Flow.Basis.Doc).DocSetRenderData(Task.AddDoc(), "STREAM", DataStream, ..FOPTemplate, "PDF" ,$LB(), $LB())
 	Set DataStream=""   ; Unswizzle CacheStream after being copied into the TaskDoc 
 	Set FName="VHossDocs_"_KLNr_" "_$TR($zdt($H,8),":")_".pdf"
-	Set Dir=##class(BL.Sys.FOP.CommonTasks).LoggedOnUserPath()
-	Set:(Dir="") Dir="\\fop\e$\FOP\PDFTemp"
-	;Do ##class(BL.Flow.Basis.Doc).BuildFileData("File", .FName,.Dir,.FilePath, "")
-	Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,Dir)
-	Quit:($$$ISERR(sc)) sc
 	
-	/// VHossDocs in archief map plaatsen
-		Set DoelLocatie = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.VisiDot.ZijkantAfhandelaar.FileLocation")
-		Set DoelLocatie = ##class(TECH.Files).AppendFile(DoelLocatie,..BatchID)
-		Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,DoelLocatie)
+	Set DoelLocatie = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.VisiDot.ZijkantAfhandelaar.FileLocation")
+	Set DoelLocatie = ##class(TECH.Files).AppendFile(DoelLocatie,..BatchID)	
+	
+	Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,DoelLocatie)
 	Quit:($$$ISERR(sc)) sc
 
 	Set %blnProxy=0
 	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,)
 	Kill %blnProxy
+		
 	Quit sc
 ]]></Implementation>
 </Method>
Index: APPS/VisiDot/impl/ZijkantAfhandelaar.cls.xml
===================================================================
diff -u -r2091 -r2104
--- APPS/VisiDot/impl/ZijkantAfhandelaar.cls.xml	(.../ZijkantAfhandelaar.cls.xml)	(revision 2091)
+++ APPS/VisiDot/impl/ZijkantAfhandelaar.cls.xml	(.../ZijkantAfhandelaar.cls.xml)	(revision 2104)
@@ -21,8 +21,7 @@
 	
 	Set CaptureHelper = ##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(ProcessedData)
 	Set VHossSequentie = CaptureHelper.GeefVHossSequentie()
-	Set BestandNaam = VHossSequentie_"_CaptureInfo_OUT"_$tr($h,",")_".xml"
-	//Set BestandNaam = VHossSequentie_"_CaptureInfo_OUT.xml"
+	Set BestandNaam = VHossSequentie_"_CaptureInfo_OUT_"_$tr($h,",")_".xml"
 	Do ..BewaarData(ProcessedData,BestandNaam)
 ]]></Implementation>
 </Method>
@@ -44,25 +43,25 @@
 <Method name="KopieerFotos">
 <Private>1</Private>
 <Implementation><![CDATA[
-		Set CaptureHelper = ##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(..ProcessedData)
-		Set VHossSequenceNr = CaptureHelper.GeefVHossSequentie()
-		
-		Set FotoIt = CaptureHelper.GeefFotoIterator()
-		While FotoIt.HasNext()
-		{
-			Set Foto = FotoIt.Next()
-			Set BestandLocatie = Foto.File
-			Set BestandLocatie = $$REPLACE^vhRtn1(BestandLocatie,"C:\Program Files\Visidot\Reader_Root\Photos","\\VISIDOT_W7\VisiDotPhotos")
-			If '##class(%File).Exists(BestandLocatie) {
-				Set Bericht = "Bestand '"_BestandLocatie_"' bestaat niet."
-				Do ##class(vhLib.Logger).%New("APPS.VisiDot").Warning("KopieerFotos",Bericht)
-				//Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.FileException).%New(Bericht,0))				
-			}Else{
-				Set Naam = VHossSequenceNr_"_"_##class(TECH.File).GeefBestandsnaam(BestandLocatie)
-				Set DoelLocatie = ##class(TECH.Files).AppendFile(..GeefDoelLocatie(..ProcessedData),Naam)
-				Do ##class(TECH.Files).CopyFile(BestandLocatie,DoelLocatie)					
-			}
+	Set CaptureHelper = ##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(..ProcessedData)
+	Set VHossSequenceNr = CaptureHelper.GeefVHossSequentie()
+	
+	Set FotoIt = CaptureHelper.GeefFotoIterator()
+	While FotoIt.HasNext()
+	{
+		Set Foto = FotoIt.Next()
+		Set BestandLocatie = Foto.File
+		Set BestandLocatie = $$REPLACE^vhRtn1(BestandLocatie,"C:\Program Files\Visidot\Reader_Root\Photos","\\VISIDOT_W7\VisiDotPhotos")
+		If '##class(%File).Exists(BestandLocatie) {
+			Set Bericht = "Bestand '"_BestandLocatie_"' bestaat niet."
+			Do ##class(vhLib.Logger).%New("APPS.VisiDot").Warning("KopieerFotos",Bericht)
+		}Else{
+			Set Naam = VHossSequenceNr_"_"_##class(TECH.File).GeefBestandsnaam(BestandLocatie)
+			Set DoelLocatie = ##class(TECH.Files).AppendFile(..GeefDoelLocatie(..ProcessedData),Naam)
+			JOB ClassMethod^vhLib("TECH.Files","JobCopyFile",2,BestandLocatie,DoelLocatie)
 		}
+	}
+	Quit
 ]]></Implementation>
 </Method>
 
Index: BL/Sys/Clean.cls.xml
===================================================================
diff -u -r1558 -r2104
--- BL/Sys/Clean.cls.xml	(.../Clean.cls.xml)	(revision 1558)
+++ BL/Sys/Clean.cls.xml	(.../Clean.cls.xml)	(revision 2104)
@@ -69,6 +69,9 @@
 	Set %Actie="HATBXLean - verwijder oude TBX batches"
  	Do ##class(BL.PPS.TBX.Sequencer).Instantiate().DeleteOldBatches()
  	
+ 	Set %Actie="VisiDot - verwijder oude bestanden"
+ 	Do ##class(APPS.VisiDot.impl.CleanUp).Execute()
+ 	
 	Quit
 
 CleanTrapW
Index: APPS/VisiDot/impl/CleanUp.cls.xml
===================================================================
diff -u
--- APPS/VisiDot/impl/CleanUp.cls.xml	(revision 0)
+++ APPS/VisiDot/impl/CleanUp.cls.xml	(revision 2104)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.VisiDot.impl.CleanUp">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="AantalDagen">
+<Description>
+Aantal dagen dat files bewaard worden.</Description>
+<Type>%Integer</Type>
+<Default>31</Default>
+</Parameter>
+
+<Method name="Execute">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+		Set Resultaat = ""
+		
+		/// Files op Notes01\Archive opkuisen
+		Set Locatie = ##class(TECH.Files).AppendFile(##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.VisiDot.ZijkantAfhandelaar.FileLocation"),"\")
+		Do SCANDIR^vhDEV(Locatie,"*.*",.Resultaat,"X",2)
+		
+		/// Files op VisiDot_W7 opkuisen
+		/// ---------------
+		/// OPMERRKING JBL : nog te doen, maar Zetes had liever dat deze gedurende de test nog bleven staan.
+		/// ---------------
+		Set Locatie = "\\visidot_w7\VisiDotPhotos\"
+		//Do $$SCANDIR^vhDEV(Locatie,"*",.Resultaat,"X",..#AantalDagen)
+				
+		Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+</Export>