Index: APPS/common/EDI/impl/EDIBasisVerwerker.cls.xml
===================================================================
diff -u -r29059 -r32518
--- APPS/common/EDI/impl/EDIBasisVerwerker.cls.xml	(.../EDIBasisVerwerker.cls.xml)	(revision 29059)
+++ APPS/common/EDI/impl/EDIBasisVerwerker.cls.xml	(.../EDIBasisVerwerker.cls.xml)	(revision 32518)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.common.EDI.impl.EDIBasisVerwerker">
 <IncludeCode>BL.EC.Common</IncludeCode>
-<Super>APPS.common.EDI.EDIVerwerker,TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Parameter name="EDILoggerGroep">
 <Default>EDI</Default>
@@ -31,31 +31,55 @@
 <Private>1</Private>
 </Property>
 
-<Method name="GeefSubPath">
-<Abstract>1</Abstract>
+<Property name="Verwerker">
+<Type>APPS.common.EDI.EDIVerwerker</Type>
 <Private>1</Private>
-<ReturnType>%String</ReturnType>
-</Method>
+</Property>
 
-<Method name="ProcessFileOrSubDir">
-<Abstract>1</Abstract>
+<Property name="ProcessAPI">
+<Type>TECH.Process.ProcessAPI</Type>
 <Private>1</Private>
+</Property>
+
+<Method name="Scan">
+<Description>
+Scans the incoming EDI mail watchfolder and processes every found file
+This method is (to be) called periodically from the Cache scheduler</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Verwerker:APPS.common.EDI.EDIVerwerker=""</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set blScan=..%New(Verwerker)
+	Do blScan.Verwerk()
+	Set blScan=""
+]]></Implementation>
 </Method>
 
 <Method name="%OnNew">
+<FormalSpec>Verwerker:APPS.common.EDI.EDIVerwerker</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim MSMGATEWAY As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
-	Set ..BasePathMSMGATEWAY=##class(TECH.Files).AppendFile(MSMGATEWAY,..GeefSubPath())	
-	Set ..DirArchive = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#ArchiveSubPath)
-    Set ..DirTemp = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#TempSubPath)
-    
-	Quit $$$OK
+	set ..Verwerker = $$$Implementation(Verwerker,..%New())
+	set ..ProcessAPI = ##class(TECH.Context).Instance().GeefProcessAPI()
+	do ..InitPaths(##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY"))
+	quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="ProcessFileOrSubDir">
+<Abstract>1</Abstract>
+<FormalSpec>DirRead:%String,FileOfSubDir:%String,DirTemp:%String,DirArchive:%String</FormalSpec>
+<Private>1</Private>
+</Method>
+
+<Method name="GeefSubPath">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="Verwerk">
 <Final>1</Final>
 <Implementation><![CDATA[	Do ..ScanFilesAndSubDirs()
@@ -66,13 +90,13 @@
 <Final>1</Final>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Lock +APPScommonEDIVerwerker:1 Else  Quit   ; exclusief gebruik 
+	Lock +^APPScommonEDIVerwerker:1 Else  Quit   ; exclusief gebruik 
 	
 	Do ..ScanSubDirs()
 	Do ..ScanFiles()	
 	Do ..ArchiveDirOpkuisen()	
 	
-	Lock -APPScommonEDIVerwerker
+	Lock -^APPScommonEDIVerwerker
 ]]></Implementation>
 </Method>
 
@@ -85,6 +109,7 @@
 	
 	Set LijstSubDirsIt=##class(TECH.ListIterator).%New(LijstSubDirs)
 	While (LijstSubDirsIt.HasNext()) {
+	
 		#dim SubDirNaam As %String = LijstSubDirsIt.Next()
 		Do ..ProcessFileOrSubDirInternal(DirRead,SubDirNaam)
 	}
@@ -100,10 +125,8 @@
 <Implementation><![CDATA[
 	#dim LijstSubDirs As %ListOfDataTypes = ..GeefLijstTeVerwerkenSubDirs(DirRead)
 	If LijstSubDirs.Count()>0 {   
-		// Na het verwerken zijn er nog subdirs aanwezig 
 		#dim msg As %String = "Er zijn nog subdirs aanwezig na verwerking in dir : "_DirRead
  		Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).Error("ImportEDI",msg)
- 		;Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte","",msg)
 	}
 ]]></Implementation>
 </Method>
@@ -155,6 +178,7 @@
 <Method name="GeefLijstTeVerwerkenSubDirs">
 <Description>
 Geeft een lijst terug met namen van te verwerken subdirs (dus niet het full path van de dir) </Description>
+<Final>1</Final>
 <FormalSpec>DirRead:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
@@ -192,6 +216,7 @@
 <Method name="SCANDIRvhDEV">
 <Description>
 ReturnArray als .local doorgeven </Description>
+<Final>1</Final>
 <FormalSpec><![CDATA[Dir:%String,WildCard:%String,&ReturnArray:%String,Optie:%String,DelDat:%String]]></FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
@@ -202,15 +227,15 @@
 </Method>
 
 <Method name="ProcessFileOrSubDirInternal">
+<Final>1</Final>
 <FormalSpec>DirRead:%String,FileOfSubDir:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).Info("ImportEDI","De file of subdir "_FileOfSubDir_" wordt verwerkt door '"_..%ClassName(1)_"' (dir="_DirRead_").")
-	
 	Try {
 		Do ..ProcessFileOrSubDir(DirRead,FileOfSubDir,..DirTemp,..DirArchive)
 		Do ..Archiveer(DirRead,FileOfSubDir,..DirArchive)
-		Hang 1
+		Do ..ProcessAPI.Sleep(1)
 		
 		Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).Info("ImportEDI","De file of subdir "_FileOfSubDir_" is verwerkt.")
 	}Catch{
@@ -223,11 +248,14 @@
 		Set Melding = Melding_Exception.ToString()
 		
 		Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).ErrorMail("ImportEDI : Verwerking niet gelukt "_..%ClassName(1),Melding)		
+		
+		W !,Exception.ToString(),!
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="Archiveer">
+<Final>1</Final>
 <FormalSpec>DirRead:%String,FileOfSubDir:%String,DirArchive:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -241,6 +269,17 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="InitPaths">
+<Final>1</Final>
+<FormalSpec>BasePath:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..BasePathMSMGATEWAY=##class(TECH.Files).AppendFile(BasePath,..GeefSubPath())	
+	Set ..DirArchive = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#ArchiveSubPath)
+    Set ..DirTemp = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#TempSubPath)
+]]></Implementation>
+</Method>
 </Class>