Index: TECH/PubSub/impl/WachtendEventAanmaken.cls.xml
===================================================================
diff -u -r4227 -r17777
--- TECH/PubSub/impl/WachtendEventAanmaken.cls.xml	(.../WachtendEventAanmaken.cls.xml)	(revision 4227)
+++ TECH/PubSub/impl/WachtendEventAanmaken.cls.xml	(.../WachtendEventAanmaken.cls.xml)	(revision 17777)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="TECH.PubSub.impl.WachtendEventAanmaken">
+<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.PubSub.EventRaiser</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -11,12 +12,74 @@
 <Implementation><![CDATA[
 	Set WachtendEvent = ##class(TECH.PubSub.WachtendEvent).%New(Event)
 	Set Status = WachtendEvent.%Save()
-	If ($$$ISERR(Status))
-	{
+	If ($$$ISERR(Status)) {
 		Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New()
 		Do Logger.ErrorMail("Onbewaarbare subscription","Event: "_Event.Type_", Status: "_$$ParseStatus^vhLib(Status))
+	} else {
+		while '..EventProcessed(WachtendEvent.%Id()) {
+			hang 0.2
+		}
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="EventProcessed">
+<FormalSpec>EventID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	set Processed = ##class(TECH.PubSub.impl.WachtendEventStatus).%ExistsId(EventID)
+	if Processed {
+		set WachtendEventStatus = ##class(TECH.PubSub.impl.WachtendEventStatus).%OpenId(EventID)
+		set Processed = WachtendEventStatus.Status = "Gelukt"
+		if 'Processed { do ..MeldGefaaldeEvent(EventID) }
+	}
+	quit Processed
+]]></Implementation>
+</Method>
+
+<Method name="MeldGefaaldeEvent">
+<FormalSpec>EventID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	if '..IsReedsGemeld(EventID) {
+		do ..Meld(EventID)
+		do ..RegistreerMelding(EventID)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsReedsGemeld">
+<FormalSpec>EventID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	quit ##class(TECH.PubSub.impl.GemeldeGefaaldeEvent).%ExistsId(EventID)
+]]></Implementation>
+</Method>
+
+<Method name="Meld">
+<FormalSpec>EventID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set From = $$$SystemMail("WachtendeEventAanmaker")
+	set To = $ListBuild("ict_sysop@vanhoecke.be")
+	set Body = ##class(%GlobalCharacterStream).%New()
+	do Body.WriteLine(" Event "_EventID_" is gefaald : ")
+	do Body.WriteLine(" momenteel staat processid "_$Job_" op "_$$$Server_" te lopen in een while lusken")
+	
+	do Body.WriteLine(" Verwerking event nakijken en eens OK status op Gelukt zettten via : ")
+	do Body.WriteLine("set E=##class(TECH.PubSub.impl.WachtendEventStatus).%OpenId("_EventID_") set E.Status = ##class(TECH.PubSub.enu.WachtendEventStatus).Gelukt() do E.Save()")
+	do Body.WriteLine($$GetJobInfo^vhLib()) 
+	Do SendMiniMail^vhLib.Mail(From,To,"!!!! Error event verwerking makova !!!!! - ( URGENT )",Body,1)
+]]></Implementation>
+</Method>
+
+<Method name="RegistreerMelding">
+<FormalSpec>EventID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set GemeldeGefaaldeEvent = ##class(TECH.PubSub.impl.GemeldeGefaaldeEvent).%New(EventID)
+	do GemeldeGefaaldeEvent.%Save()
+]]></Implementation>
+</Method>
 </Class>
 </Export>