Index: EWRECA.mac.rou
===================================================================
diff -u -r1831 -r1832
--- EWRECA.mac.rou	(.../EWRECA.mac.rou)	(revision 1831)
+++ EWRECA.mac.rou	(.../EWRECA.mac.rou)	(revision 1832)
@@ -8,15 +8,16 @@
  Do ^cA604,INIT^vhTERMINA
  Set ChkRtn="EWRECR"
  Quit:$P($H,",",2)<3600  ; Eerste uur na middernacht niet controleren, want dan wordt de nachtelijke stockscan overgebracht.
- Quit:$$JOBRUN(ChkRtn)
- Do ERROR^EWLOG($T(NOSTART))
- Set From=$ZUTIL(110)_"@VANHOECKE.BE",To=$LB("ICT_SysOp@vanhoecke.be"),Subject=ChkRtn_" gestopt"
- Set Body="De link met het EWMS is verbroken!!!"_$C(13,10)_"Routine ^EWRECR draait niet meer"_$C(13,10)_"Gelieve dit dringend op te lossen!!!"
- Set Status=$$SendMiniMail^vhLib(From,To,Subject,Body)
- ;S X="NET SEND CW_XP ""EWRECR draait niet meer"""
- ;S X=$ZF(-1,X)
- ;S X="NET SEND PV_XP ""EWRECR draait niet meer"""
- ;S X=$ZF(-1,X)
+ If '$$JOBRUN(ChkRtn) Do
+ . Do ERROR^EWLOG($T(NOSTART))
+ . Set From=$ZUTIL(110)_"@VANHOECKE.BE",To=$LB("ICT_SysOp@vanhoecke.be"),Subject=ChkRtn_" gestopt"
+ . Set Body="De link met het EWMS is verbroken!!!"_$C(13,10)_"Routine ^EWRECR draait niet meer"_$C(13,10)_"Gelieve dit dringend op te lossen!!!"
+ . Set Status=$$SendMiniMail^vhLib(From,To,Subject,Body)
+ . ;S X="NET SEND CW_XP ""EWRECR draait niet meer"""
+ . ;S X=$ZF(-1,X)
+ . ;S X="NET SEND PV_XP ""EWRECR draait niet meer"""
+ . ;S X=$ZF(-1,X)
+ Do CHECKZMRPMD ; Makova testen
  Quit
  
 TEST Set ChkRtn="EWRECR"
@@ -32,6 +33,34 @@
  .Set Routine=$S(Job:$$ROUTINE^cS(Job),1:"*")
  Quit Routine=ChkRtn
  
+ 
+CHECKZMRPMD ; Makova
+	Quit:'$D(^rOBJ("%ZMRASD")) ; Makova is niet geinstalleerd
+	For I=1:1:5 Do  Quit:Found
+	. Set lbPID=$$CHECKJOB("%ZMRPMD")
+	. Set Found=$LL(lbPID)
+	. Quit:Found
+	. Hang 2
+	Quit:Found
+	Set NameSpace=$ZNSPACE
+	zn "%SYS"
+	Do RUN^%ZMRPMD	
+	zn NameSpace
+	Set From=$ZUTIL(110)_"@VANHOECKE.BE",To=$LB("PV@VANHOECKE.BE"),Subject="Makova's "_%ZMRPMD_" is gestopt"
+ 	Set Body="Het programma %ZMRPMD was gestopt maar is terug opgestart !!!"
+ 	Set Status=$$SendMiniMail^vhLib(From,To,Subject,Body)
+	Quit
+ 
+CHECKJOB(ChkRtn)
+	Set lbPID="" 
+  	Set PID=""
+ 	For  Set PID=$O(^$JOB(PID)) Quit:PID=""  Do
+ 	. Set oP=##class(%SYSTEM.Process).%OpenId(PID)
+ 	. Quit:'$IsObject(oP)
+ 	. Quit:oP.CurrentLineAndRoutine'[ChkRtn
+ 	. Set lbPID=lbPID_$LB(PID)
+ 	Quit lbPID
+ 
 RESTART ; Oproep voor de LINK-button in vhMAIL om EWRECR terug op te starten
  New ReStart
  Set ReStart=$$^vhTXTPOP("EWRECR","RESTARTV")
@@ -51,8 +80,8 @@
  Do CLNDIR(10,"DIRSARCHIVE") ; Send
  Do CLNREC("R",30)
  Do CLNREC("S",30)
- Do CLNORDW(120)
- Do CLNRCP(120,365)
+ Do CLNORDW(90)
+ Do CLNRCP(90)
  Quit
  
 CLNREC(Node,Dagen) 
@@ -73,14 +102,13 @@
  .Do REMWMS^EWORDST(CONSNr)
  Quit
  
-CLNRCP(IDagen,AbsDagen) 
+CLNRCP(Dagen) 
  ; Receptiees in RCP ouder dan x dagen verwijderen
  Set RCPNr=""
  For  Set RCPNr=$O(^RCP("D",RCPNr)) Quit:RCPNr=""  Do
- . Set Rec=^RCP("D",RCPNr)
- . If +$P(Rec,D,24) Quit:($P(Rec,D,24)+IDagen)>+$H  ; Indien volledig ingeboekt en nog niet IDagen oud
- . Else  Quit:($P(Rec,D,22)+AbsDagen)>+$H  ; nog niet volledig ingeboekt
- . Do DELOBJ^EWRCPST(RCPNr)
+ .Set Rec=^RCP("D",RCPNr)
+ .Quit:$P(Rec,D,22)+Dagen+(Dagen*$P(Rec,D,20)'="I")>+$H  ; Minder dan x dagen gerecepteerd
+ .Do DELOBJ^EWRCPST(RCPNr)
  Quit
  
 CLNDIR(Dagen,Label) ;Opkuizen archive 
Index: EWRECR.mac.rou
===================================================================
diff -u -r1828 -r1832
--- EWRECR.mac.rou	(.../EWRECR.mac.rou)	(revision 1828)
+++ EWRECR.mac.rou	(.../EWRECR.mac.rou)	(revision 1832)
@@ -20,10 +20,10 @@
 	;Do ERROR^EWLOG($T(GESTART))
 	
 	Set $ZTrap="OnEWRECRError"
-	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).Info("Start","EWRECR wordt gestart"_$$$CRLF_$$GetJobInfo^vhLib.System())
+	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).Info("Start","EWRECR wordt gestart."_"   Device: "_$I)
 	Do INIT
 	Do ERROR^EWLOG($T(GESTART))
-	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).Info("Start","EWRECR is gestart")
+	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).Info("Start","EWRECR is gestart.")
 	
 	For  Quit:EWLoop="STOP"  Do  Quit:EWLoop="STOP"
 	. ;Use WDev
@@ -45,7 +45,7 @@
 	. Set:Ok=1 EWLoop="STOP"
  
 	Do:EWLoop="STOP" ERROR^EWLOG($T(GESTOPT))
-	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).InfoMail("Stop","EWRECR is gestopt (var EWLoop="_EWLoop_")")
+	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).InfoMail("Stop","EWRECR is gestopt (var EWLoop="_EWLoop_").")
  
 	Do CLEANUP
 	;Close:$G(WDev) WDev
@@ -57,7 +57,7 @@
 	Set $ZTrap=""
 	New Exception
 	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).ErrorMail("ErrorTrap","EWRECR is gecrashed: "_Exception.ToString())
+	Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).ErrorMail("ErrorTrap","EWRECR is gecrashed: "_Exception.ToString()_"  "_$$$CRLF_$$GetJobInfo^vhLib.System())
 	Do CLEANUP
 	Quit
  
@@ -83,7 +83,7 @@
 StopSignal(TimeOut) 
  New Ok,Ok2
  Do ERROR^EWLOG($T(MANSTOP))
- Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).Info("Stop",$TEXT(MANSTOP)_$$$CRLF_$$GetJobInfo^vhLib.System())
+ Do ##class(vhLib.Logger).%New($$$EWRECRLoggerGroep).Info("Stop",$TEXT(MANSTOP)_".   Device: "_$I)
  Set Ok=$System.Event.Create("EWRECSTOPPED")
  Set Ok=$S($System.Event.Defined("EWRECSTOP"):$System.Event.Signal("EWRECSTOP"),1:0)
  Set Ok=$System.Event.Wait("EWRECSTOPPED",$G(TimeOut,30)) ; wachten totdat EWREC gestopped