Index: AXimpl/MessageInProcessor.cls.xml
===================================================================
diff -u -r49566 -r66240
--- AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 49566)
+++ AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 66240)
@@ -3,7 +3,7 @@
 <Class name="AXimpl.MessageInProcessor">
 <Super>TECH.IteratorUitvoerderOpdracht</Super>
 
-<Property name="FileAPI">
+<Property name="FileApi">
 <Type>TECH.File.FileAPI</Type>
 <Private>1</Private>
 </Property>
@@ -28,71 +28,117 @@
 <Private>1</Private>
 </Property>
 
+<Property name="MailApi">
+<Type>TECH.Mail.MailAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VerwerkBestandOpnieuwAanvraagRepository">
+<Type>AXimpl.VerwerkBestandOpnieuwAanvraagRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ExceptionLogger">
+<Type>AXimpl.MessageInProcessor.ExceptionLogger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AXUtils">
+<Type>AXimpl.Utils</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Files">
+<Type>TECH.Files</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>FileAPI:TECH.File.FileAPI,XmlCorrelater:TECH.XMLCorrelater,EventRaiser:AXimpl.EventRaiser,ConfigIn:AXimpl.ConfigIn</FormalSpec>
+<FormalSpec>FileApi:TECH.File.FileAPI="",XmlCorrelater:TECH.XMLCorrelater="",EventRaiser:AXimpl.EventRaiser="",ConfigIn:AXimpl.ConfigIn="",VerwerkBestandOpnieuwAanvraagRepository:AXimpl.VerwerkBestandOpnieuwAanvraagRepository="",MailApi:TECH.Mail.MailAPI="",ExceptionLogger:AXimpl.MessageInProcessor.ExceptionLogger="",AXUtils:AXimpl.Utils,Files:TECH.Files</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..FileAPI = $$$Inject(FileAPI,##class(TECH.File.impl.FileAPI).%New())
-	Set ..XmlCorrelater = $$$Inject(XmlCorrelater,##class(TECH.XMLCorrelater).%New())
-	Set ..EventRaiser = $$$Inject(EventRaiser,##class(AXimpl.EventRaiser).%New())
-	Set ..ConfigIn = $$$Inject(ConfigIn,##class(AXimpl.ConfigIn).%New())
+	Set ..FileApi = $$$Inject(FileApi, ##class(TECH.File.impl.FileAPI).%New())
+	Set ..XmlCorrelater = $$$Inject(XmlCorrelater, ##class(TECH.XMLCorrelater).%New())
+	Set ..EventRaiser = $$$Inject(EventRaiser, ##class(AXimpl.EventRaiser).%New())
+	Set ..ConfigIn = $$$Inject(ConfigIn, ##class(AXimpl.ConfigIn).%New())
+	Set ..VerwerkBestandOpnieuwAanvraagRepository = $$$Inject(VerwerkBestandOpnieuwAanvraagRepository, ##class(VerwerkBestandOpnieuwAanvraagRepository).%New())
 	Set ..Logger = ##class(vhLib.Logger).%New()
+	Set ..MailApi = $$$Inject(MailApi, ##class(TECH.Context).Instance().GeefMailAPI())
+	Set ..ExceptionLogger = $$$Inject(ExceptionLogger, ##class(AXimpl.MessageInProcessor.ExceptionLogger).%New())
+	Set ..AXUtils = $$$Inject(AXUtils,##class(AXimpl.Utils).%New())
+	Set ..Files= $$$Inject(Files, ##class(TECH.Files).%New())
 	
-	quit $$$OK
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Verwerk">
-<FormalSpec>FullFilename:%String</FormalSpec>
 <Implementation><![CDATA[
 	Lock +^AXimpl.MessageInProcessor:0 
-	Else  Quit	
+	Else  Quit
 	
-	If $$$Not(..FileAPI.FileExists(FullFilename)) {
-		Lock -^AXimpl.MessageInProcessor
-		Quit	
-	}
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim ListOfDirectories as %ListOfDataTypes = ..AXUtils.GeefAXRequestDirectoryList(Path)
+	;om  problemen bij mass updates te voorkomen, de eerste 20 bestanden opvragen 
+	;en niet alleen het eerste want nodig om een volgend bestand te kunnen verwerken bij retry exceptions
+	Hang .1 ;soms file not found.
+	#dim FileIterator As TECH.Iterator = ..Files.GetFilesFromListOfDirectories(ListOfDirectories,"*.xml",20)
 	
-	#dim SessionId As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()
-	Set $piece(SessionId," ",2) = ##class(TECH.File).GeefBestandsnaam(FullFilename)
-
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AxIncomingFileBasedRequests")
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID("AX.MessageInProcessor_"_$job)
 	
-	Do ..Logger.Info("Verwerking inkomende AX bestand", "Bestandsnaam " _FullFilename)
+	#dim VerwerkVolgende as %Boolean = $$$True
 	
-	Try {
+	While (VerwerkVolgende) {
+		Try {
+			While (VerwerkVolgende && FileIterator.HasNext()){				
+				#dim FullFilename as %String = FileIterator.Next()
+				#dim SessionId As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()
+				Set $piece(SessionId," ",2) = ##class(TECH.File).GeefBestandsnaam(FullFilename)
+				Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
 
-		#dim DebugStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
-		Do DebugStream.WriteLine("Xml data : ")
-		Do DebugStream.CopyFrom(..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		Do ..Logger.Debug("Verwerking inkomende AX stream", DebugStream )	
-		
-		#dim SubPath As %String = ..ExtractSubPath(FullFilename)
-		
-		#dim KlasseNaam As %String = ..ConfigIn.GetRequestEnvelope(SubPath)
-		#dim Message As %CacheString = ..XmlCorrelater.GeefObjectVanBestand(FullFilename, KlasseNaam, "Envelope")
-
-		#dim Converter As AXimpl.Converter = ..ConfigIn.GetConverter(SubPath)
-		Do Converter.Convert(Message)
-		
-		Do ..EventRaiser.RaiseRequestReceivedEvent(SubPath,FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		
-		Do ..FileAPI.DeleteFile(FullFilename)
-	} Catch {
-		try {
-			#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-			Do ..LogException(FullFilename, Exception)
-			Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
-			Do ..MoveFileToErrorMap(FullFilename , SubPath)
-		} catch {
-			#dim InnerException As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		}
+				;verwerking
+				#dim DebugStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
+				Do DebugStream.WriteLine("Xml data : ")
+				Do DebugStream.CopyFrom(..FileApi.GeefFileReader(FullFilename).GeefStream())
+				Do ..Logger.Debug("Verwerking inkomende AX stream", DebugStream )	
+								
+				#dim SubPath As %String = ..ExtractSubPath(FullFilename)
+				
+				#dim KlasseNaam As %String = ..ConfigIn.GetRequestEnvelope(SubPath)
+				#dim Message As %CacheString = ..XmlCorrelater.GeefObjectVanBestand(FullFilename, KlasseNaam, "Envelope")
+				#dim Converter As AXimpl.Converter = ..ConfigIn.GetConverter(SubPath)
+				Do Converter.Convert(Message)
+				Do ..EventRaiser.RaiseRequestReceivedEvent(SubPath, FullFilename, ..FileApi.GeefFileReader(FullFilename).GeefStream())
+				Do ..FileApi.DeleteFile(FullFilename)
+				Do ..Logger.Info("Verwerking inkomende AX stream","Deleted " _ FullFilename)
+				;eind verwerking
+				Do ..MarkeerVerwerkBestandOpnieuwAanvraagVerwerkt(FullFilename)
+				Set VerwerkVolgende = $$$False
+			}
+			Set VerwerkVolgende = $$$False
+		} Catch {
+			Try {
+				#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+				If (Exception.%IsA(##class(AXimpl.VerwerkAXBerichtLaterOpnieuwException).%ClassName($$$True))) {
+					Do ..Logger.Info("Verwerk AX bericht '"_FullFilename_"' later opnieuw", Exception.GeefOmschrijving())
+					Do ..RegistreerVerwerkBestandOpnieuwAanvraag(FullFilename)
+	 			} Else {
+					Set VerwerkVolgende = $$$False
+					Do ..ExceptionLogger.LogException(FullFilename, Exception)
+					Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename, ..FileApi.GeefFileReader(FullFilename).GeefStream())
+					Do ..MoveFileToErrorMap(FullFilename , SubPath)
+					Do ..MarkeerVerwerkBestandOpnieuwAanvraagVerwerkt(FullFilename)
+				}
+			} Catch {
+				#dim InnerException As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+				Set VerwerkVolgende = $$$False
+			}
+		}	
 	}
-	
 	Lock -^AXimpl.MessageInProcessor
 ]]></Implementation>
 </Method>
@@ -102,12 +148,11 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim SubPath As %String = ##class(TECH.StringUtils).Replace(FullFilename,##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath"),"")
-	
+	#dim SubPath As %String = $Extract(FullFilename, $Length(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath"))+1,*)
 	#dim FileName As %String = ##class(TECH.File).GeefBestandsnaam(SubPath)
-	Set SubPath = ##class(TECH.StringUtils).Replace(SubPath,"\"_FileName,"")
-	Set SubPath = $Extract(SubPath,2,*)
-	Set SubPath = ##class(TECH.StringUtils).Replace(SubPath,"\","/")
+	Set SubPath = ##class(TECH.StringUtils).Replace(SubPath, "\" _ FileName, "")
+	Set SubPath = $Extract(SubPath, 2, *)
+	Set SubPath = ##class(TECH.StringUtils).Replace(SubPath, "\", "/")
 	
 	Quit SubPath
 ]]></Implementation>
@@ -117,24 +162,67 @@
 <FormalSpec>FullFilename:%String,SubPath:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ErrorPath As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GetString("AX_IF_IN_ErrorPath"),SubPath)
-	#dim ErrorFilename As %String = ##class(TECH.Files).AppendFile(ErrorPath,##class(TECH.File).GetFilename(FullFilename))
-	Do ..FileAPI.GeefDirectoryUtils().CreateIfNotExists(ErrorPath)
-	Do ..FileAPI.MoveFile(FullFilename,ErrorFilename)
+	#dim ErrorPath As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GetString("AX_IF_IN_ErrorPath"), SubPath)
+	#dim ErrorFilename As %String = ##class(TECH.Files).AppendFile(ErrorPath, ##class(TECH.File).GetFilename(FullFilename))
+	
+	Do ..FileApi.GeefDirectoryUtils().CreateIfNotExists(ErrorPath)
+	Do ..FileApi.MoveFile(FullFilename, ErrorFilename)
+	Do ..Logger.Info("MoveFileToErrorMap","Moved " _ FullFilename _ " to " _ ErrorFilename)
 ]]></Implementation>
 </Method>
 
-<Method name="LogException">
-<FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
+<Method name="RegistreerVerwerkBestandOpnieuwAanvraag">
+<FormalSpec>Filenaam:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ExceptionMessage As %Stream.Object = ##class(%GlobalCharacterStream).%New()
-	do ExceptionMessage.WriteLine("Filename : " _FullFilename)
-	do ExceptionMessage.WriteLine("")
-	do ExceptionMessage.CopyFrom(Exception.ToStream())
-	Do ..Logger.ErrorMail("Verwerking inkomende AX bestand", ExceptionMessage)
+	If ..VerwerkBestandOpnieuwAanvraagRepository.BestaatViaBestandnaam(Filenaam){
+		#dim Aanvraag as AXimpl.VerwerkBestandOpnieuwAanvraag = ..VerwerkBestandOpnieuwAanvraagRepository.GeefViaBestandNaam(Filenaam)		
+	} Else {
+		Set Aanvraag = ..VerwerkBestandOpnieuwAanvraagRepository.Maak()
+		Set Aanvraag.BestandNaam = Filenaam
+		Set Aanvraag.Teller = 0
+		Set Aanvraag.Sinds = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentTimeStamp()
+	}
+	
+	Set Aanvraag.Teller = Aanvraag.Teller + 1
+	
+	If ((Aanvraag.Teller >= 300) && ((Aanvraag.Teller # 60) = 0)) {
+		Do ..StuurMailBerichtTeveelNietVerwerkt(Filenaam)
+	}
+	
+	Do ..VerwerkBestandOpnieuwAanvraagRepository.Bewaar(Aanvraag)
 ]]></Implementation>
 </Method>
+
+<Method name="MarkeerVerwerkBestandOpnieuwAanvraagVerwerkt">
+<FormalSpec>Filenaam:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..VerwerkBestandOpnieuwAanvraagRepository.BestaatViaBestandnaam(Filenaam){
+		#dim Aanvraag as AXimpl.VerwerkBestandOpnieuwAanvraag = ..VerwerkBestandOpnieuwAanvraagRepository.GeefViaBestandNaam(Filenaam)		
+		Set Aanvraag.VerwerktOp = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentTimeStamp()
+		Do ..VerwerkBestandOpnieuwAanvraagRepository.Bewaar(Aanvraag)	
+	} Else {
+		; bestand is zonder extra pogingen verwerkt, niets te doen
+	}
+]]></Implementation>
+</Method>
+
+<Method name="StuurMailBerichtTeveelNietVerwerkt">
+<FormalSpec>FullFilename:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Mail As TECH.Mail.Mail = ..MailApi.MaakNieuwMail()
+	Do Mail.ZetVerzender($$$SystemMail("AXimpl.MessageInProcessor"))
+	Do Mail.VoegToeOntvanger("ICT_Meldingen@vanhoecke.be")
+	Do Mail.ZetOnderwerp("AX bericht geraakt niet verwerkt")
+	
+	#dim MeldingTekst as %String = "Bericht in bestand '" _ FullFilename _ "' geraakt reeds meer dan 5 minuten niet verwerkt. Check de log om te zien waarom."
+	Do Mail.ZetInhoud("Beste,"_ $$$CRLF _ $$$CRLF _ MeldingTekst)
+	Do ..MailApi.VerstuurMail(Mail)
+	Do ..Logger.Error("AXimpl.MessageInProcessor", "Actie nodig:" _ $$$CRLF _ MeldingTekst, 0)
+]]></Implementation>
+</Method>
 </Class>