diff --git a/m/BSDX21.m b/m/BSDX21.m index a933899..6fea370 100644 --- a/m/BSDX21.m +++ b/m/BSDX21.m @@ -1,4 +1,4 @@ -BSDX21 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; +BSDX21 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/21/10 9:42pm ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ; ; @@ -67,7 +67,7 @@ DELAG(BSDXY,BSDXGRP) ;EP S BSDXIEN=BSDXGRP ;I '$D(^BSDXAGP("B",BSDXGRP)) D ERR(BSDXI,0,0) Q ;S BSDXIEN=$O(^BSDXAGP("B",BSDXGRP,0)) - I '+BSDXIEN D ERR(BSDXI,BSDXIEN,70) Q + I '+BSDXIEN D ERR(BSDXI,BSDXIEN) Q I '$D(^BSDXAGP(BSDXIEN,0)) D ERR(0,"BSDX14: Invalid Access Group ID name.") Q ; ;Delete BSDXACCESS GROUP TYPE entries diff --git a/m/BSDX27.m b/m/BSDX27.m index 226edc7..f181005 100644 --- a/m/BSDX27.m +++ b/m/BSDX27.m @@ -1,4 +1,4 @@ -BSDX27 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 4/29/10 9:43pm +BSDX27 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/21/10 9:52pm ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ; ; @@ -125,15 +125,15 @@ STATUS(PAT,DATE,NODE) ; returns appt status Q TYP ; ERROR ; - D ERR("RPMS Error") + D ERR(BSDXI,"RPMS Error") Q ; -ERR(ERRNO) ;Error processing +ERR(BSDXI,ERRNO,MSG) ;Error processing S:'$D(BSDXI) BSDXI=999 I +ERRNO S BSDXERR=ERRNO+134234112 ;vbObjectError E S BSDXERR=ERRNO S BSDXI=BSDXI+1 - S ^BSDXTMP($J,BSDXI)="^^^^^^^^^^^^^^^"_$C(30) + S ^BSDXTMP($J,BSDXI)=MSG_"^^^^^^^^^^^^^^^"_$C(30) S BSDXI=BSDXI+1 S ^BSDXTMP($J,BSDXI)=$C(31) Q diff --git a/m/BSDX34.m b/m/BSDX34.m index f4f31df..8547179 100644 --- a/m/BSDX34.m +++ b/m/BSDX34.m @@ -1,4 +1,4 @@ -BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; +BSDX34 ; IHS/OIT/HMW - WINDOWS SCHEDULING RPCS ; 5/21/10 9:56pm ;;2.0;IHS WINDOWS SCHEDULING;;NOV 01, 2007 ; ; @@ -49,10 +49,10 @@ RBCLIN(BSDXY,BSDXCLST,BSDXBEG,BSDXEND) ;EP ;Convert beginning and ending dates ; S X=BSDXBEG,%DT="XT" D ^%DT S BSDXBEG=$P(Y,"."),BSDXBEG=BSDXBEG-1,BSDXBEG=BSDXBEG_".9999" - I Y=-1 D RBERR(1) Q + I Y=-1 D RBERR Q S X=BSDXEND,%DT="XT" D ^%DT S BSDXEND=$P(Y,"."),BSDXEND=BSDXEND_".9999" - I Y=-1 D RBERR(1) Q - I BSDXCLST="" D RBERR(1) Q + I Y=-1 D RBERR Q + I BSDXCLST="" D RBERR Q ; ; ;If BSDXCLST is a list of resource NAMES, look up each name and convert to IEN