Changeset 1461 for Scheduling/trunk/m/BSDX08.m

Timestamp:

Jun 26, 2012, 8:01:30 PM (12 years ago)

Author:

Sam Habiel

Message:

Refactoring cont.
Many changes in BSDX08. Extensive changes in BSDX31. Creation of BSDXAPI1 as continuation of BSDXAPI.
BSDXUT1 now has UTs for BSDX31. Transactions now gone from BSDX08 and BSDX31.
BSDX08 needs more tests at failure points. BSDX31 still needs analysis for transaction failure and
code for rollback points, plus tests for that.

File:

• Scheduling/trunk/m/BSDX08.m (modified) (10 diffs)

Scheduling/trunk/m/BSDX08.m

@@ -1 @@
-BSDX08  ; VW/UJO/SMH - WINDOWS SCHEDULING RPCS ; 6/25/12 6:17pm
+BSDX08  ; VW/UJO/SMH - WINDOWS SCHEDULING RPCS ; 6/26/12 10:49am
         ;;1.7T1;BSDX;;Aug 31, 2011;Build 18
         ; 
@@ -6 +6 @@
         ; Change History
         ; 3101022 UJO/SMH v1.42
-        ;  - Transaction now restartable. Thanks to 
-        ;   --> Zach Gonzalez and Rick Marshall for fix.
-        ;  - Extra TROLLBACK in Lock Statement when lock fails.
-        ;   --> Removed--Rollback is already in ERR tag.
-        ;  - Added new statements to old SD code in AVUPDT to obviate
-        ;   --> need to restore variables in transaction
-        ;  - Refactored this chunk of code. Don't really know whether it 
-        ;   --> worked in the first place. Waiting for bug report to know.
+        ;  - Transaction work. As of v 1.7, all work here has been superceded
+        ;  - Refactoring of AVUPDT - never tested though.
         ;  - Refactored all of APPDEL.
         ; 
@@ -19 +13 @@
         ;  - Added ability to remove checked in appointments. Added a couple
         ;    of units tests for that under UT2.
-        ;  - Minor reformatting because of how KIDS adds tabs.
+        ; 
+        ; 3120625 VEN/SMH v1.7
+        ;  - Transactions removed. Code refactored to work w/o txns.
         ; 
         ; Error Reference:
@@ -31 +27 @@
         ;  -8^BSDX08: Unable to find associated PIMS appointment for this patient
         ;  -9^BSDX08: BSDXAPI returned an error: (error)
+        ;  -10^BSDX08: $$BSDXCAN failed (Fileman filing error)
         ;  -100~BSDX08 Error: (Mumps Error)
         ;
@@ -76 +73 @@
         ;
         ;;;test for error inside transaction. See if %ZTER works
-        I $G(BSDXDIE) S X=1/0
+        I $G(BSDXDIE1) N X S X=1/0
         ;
         ; Check appointment ID and whether it exists
@@ -90 +87 @@
         ; Check the resource ID and whether it exists
         N BSDXSC1 S BSDXSC1=$P(BSDXNOD,U,7) ;RESOURCEID
-        ; If the resouce id doesn't exist...
+        ; If the resource id doesn't exist...
         I BSDXSC1="" D ERR(BSDXI,"-4~BSDX08: Cancelled appointment does not have a Resouce ID") QUIT
         I '$D(^BSDXRES(BSDXSC1,0)) D ERR(BSDXI,"-5~BSDX08: Resouce ID does not exist in BSDX RESOURCE") QUIT
         ;
-        ; BSDXAPPT First; todo: check for error
-        D BSDXCAN(BSDXAPTID)  ; Add a cancellation date in BSDX APPOINTMENT
-        ;
-        ; Process PIMS issues second: 
-        ; cancel appt in "S" nodes in file 2 and 44, then update Legacy PIMS Availability
+        ;
+        ; Check if PIMS will let us cancel the appointment using $$CANCELCK^BSDXAPI
         ; Get zero node of resouce
         N BSDXNOD S BSDXNOD=^BSDXRES(BSDXSC1,0)
         ; Get Hosp location
         N BSDXLOC S BSDXLOC=$P(BSDXNOD,U,4)
-        ; Error indicator for Hosp Location filing for getting out of routine
+        ; Error indicator
         N BSDXERR S BSDXERR=0
-        ; For BSDXC
-        N BSDXC
-        ; Only file in 2/44 if there is an associated hospital location
-        I BSDXLOC D  QUIT:BSDXERR
+        ; 
+        N BSDXC ; Array to pass to BSDXAPI
+        ;
+        I BSDXLOC D 
         . S BSDXC("PAT")=BSDXPATID
         . S BSDXC("CLN")=BSDXLOC
@@ -120 +114 @@
         . ;
         . S BSDXERR=$$CANCELCK^BSDXAPI(.BSDXC) ; 0 or 1^error message
-        . I BSDXERR D ERR(BSDXI,"-9^BSDX08: BSDXAPI returned an error: "_$P(BSDXERR,U,2)) QUIT
+        ; If error, quit. No need to rollback as no changes took place.
+        I BSDXERR D ERR(BSDXI,"-9~BSDX08: BSDXAPI reports that "_$P(BSDXERR,U,2)) QUIT
+        ;
+        I $G(BSDXDIE2) N X S X=1/0
+        ;
+        ; Now cancel the appointment for real
+        ; BSDXAPPT First; no need for rollback if error occured.
+        N BSDXERR S BSDXERR=$$BSDXCAN(BSDXAPTID)  ; Add a cancellation date in BSDX APPOINTMENT
+        I BSDXERR D ERR(BSDXI,"$$BSDXCAN failed (Fileman filing error): "_$P(BSDXERR,U,2)) QUIT
+        ;
+        ; Then PIMS: 
+        ; cancel appt in "S" nodes in file 2 and 44, then update Legacy PIMS Availability
+        ; If error happens, must rollback ^BSDXAPPT
+        I BSDXLOC D  QUIT:BSDXERR
+        . N BSDXLEN S BSDXLEN=$$APPLEN^BSDXAPI(BSDXPATID,BSDXLOC,BSDXSTART) ; appt length
+        . S BSDXERR=$$CANCEL^BSDXAPI(.BSDXC) ; Cancel through BSDXAPI
+        . ; Rollback BSDXAPPT if error occurs
+        . ; TODO: If an M error occurs in BSDXAPI, ETRAP gets called, ^BSDXTMP is
+        . ;       populated, then the output of $$CANCEL is the output of ETRAP.
+        . ;       Then, we see that BSDXERR is true, and we do another write,
+        . ;       which deletes the information we had in ^BSDXTMP. What to do???
+        . I BSDXERR D ERR(BSDXI,"-9^BSDX08: BSDXAPI returned an error: "_$P(BSDXERR,U,2)),ROLLBACK(BSDXAPTID)  QUIT
         . ;
-        . N BSDXLEN S BSDXLEN=$$APPLEN^BSDXAPI(BSDXPATID,BSDXLOC,BSDXSTART)
-        . ;
-        . ; Cancel through BSDXAPI
-        . S BSDXERR=$$CANCEL^BSDXAPI(.BSDXC)
-        . I BSDXERR=1 D ERR(BSDXI,"-9^BSDX08: BSDXAPI returned an error: "_$P(BSDXZ,U,2)) QUIT
-        . ; Update Legacy PIMS clinic Availability
+        . ; Update Legacy PIMS clinic Availability ; no failure expected here.
         . D AVUPDT(BSDXLOC,BSDXSTART,BSDXLEN)
         ;
@@ -138 +148 @@
         Q
         ;
-ROLLBACK(BSDXAPTID)
 AVUPDT(BSDXSCD,BSDXSTART,BSDXLEN)       ;Update Legacy PIMS Clinic availability
         ;See SDCNP0
@@ -185 +194 @@
         Q
         ;
-BSDXCAN(BSDXAPTID)      ;
-        ;Cancel BSDX APPOINTMENT entry
-        N %DT,X,BSDXDATE,Y,BSDXIENS,BSDXFDA,BSDXMSG
-        S %DT="XT",X="NOW" D ^%DT ; X ^DD("DD")
-        S BSDXDATE=Y
+BSDXCAN(BSDXAPTID)      ; $$; Private; Cancel BSDX APPOINTMENT entry
+        ; Input: Appt IEN in ^BSDXAPPT
+        ; Output: 0 for success and 1^Msg for failure
+        N BSDXDATE,BSDXIENS,BSDXFDA,BSDXMSG
+        S BSDXDATE=$$NOW^XLFDT()
         S BSDXIENS=BSDXAPTID_","
         S BSDXFDA(9002018.4,BSDXIENS,.12)=BSDXDATE
-        K BSDXMSG
         D FILE^DIE("","BSDXFDA","BSDXMSG")
-        Q
+        I $D(BSDXMSG) Q 1_U_BSDXMSG("DIERR",1,"TEXT",1)
+        QUIT 0
+        ;
+ROLLBACK(BSDXAPTID)  ; Proc; Private; Rollback cancellation
+        ; Input same as $$BSDXCAN
+        N BSDXIENS S BSDXIENS=BSDXAPTID_","
+        N BSDXFDA S BSDXFDA(9002018.4,BSDXIENS,.12)="@"
+        N BSDXMSG
+        D FILE^DIE("","BSDXFDA","BSDXMSG")
+        ;I $D(BSDXMSG)  ; Not sure what to do. We are already handling an error.
+        QUIT
         ;
 CANEVT(BSDXPAT,BSDXSTART,BSDXSC)        ;EP Called by BSDX CANCEL APPOINTMENT event
@@ -248 +266 @@
         D ^%ZTER
         S $EC=""  ; Clear Error
+        ; Roll back BSDXAPPT; 
+        ; TODO: What if a Mumps error happens in fileman in BSDXAPI? The Scheduling files can potentially be out of sync
+        D:$G(BSDXAPTID) ROLLBACK(BSDXAPTID)
         ; Log error message and send to client
         I '$D(BSDXI) N BSDXI S BSDXI=0
         D ERR(BSDXI,"-100~BSDX08 Error: "_$G(%ZTERZE))
-        QUIT
+        Q:$Q 1_U_"-100~Mumps Error" Q
         ;
         ;;;NB: This is code that is unused in both original and port.