Changeset 22

Timestamp:

Jun 26, 2008, 1:51:24 PM (16 years ago)

Author:

George Lilly

Message:

Minor code cleanup -- some test case bugs fixed

Location:

ccr/trunk/p

Files:

• GPLCCR.m (modified) (1 diff)
• GPLCCR0.m (modified) (1 diff)
• GPLPROBS.m (modified) (1 diff)
• GPLUNIT.m (modified) (2 diffs)
• GPLXPATH.m (modified) (5 diffs)

ccr/trunk/p/GPLCCR.m

@@ -48 +48 @@
         . X CALL
         . ; NOW INSERT THE RESULTS IN THE CCR BUFFER
-        . ; D INSERT^GPLXPATH(CCRGLO,OXML,"//ContinuityOfCareRecord/Body")
+        . D INSERT^GPLXPATH(CCRGLO,OXML,"//ContinuityOfCareRecord/Body")
         . I DEBUG F GPLI=1:1:@OXML@(0) W @OXML@(GPLI),!
-        . D QOPEN^GPLXPATH("CCRBLD",CCRGLO,"//ContinuityOfCareRecord/Body")
-        . D QUEUE^GPLXPATH("CCRBLD",OXML,1,@OXML@(0))
-        . D QCLOSE^GPLXPATH("CCRBLD",CCRGLO,"//ContinuityOfCareRecord/Body")
-        . I DEBUG W "GOING TO BUILD CCR",!
-        . N CCRTMP
-        . D BUILD^GPLXPATH("CCRBLD","CCRTMP")
-        . I DEBUG F GPLI=1:1:CCRTMP(0) W CCRTMP(GPLI),!
-        . D CP^GPLXPATH("CCRTMP",CCRGLO)
+        . ; D QOPEN^GPLXPATH("CCRBLD",CCRGLO,"//ContinuityOfCareRecord/Body")
+        . ; D QUEUE^GPLXPATH("CCRBLD",OXML,1,@OXML@(0))
+        . ; D QCLOSE^GPLXPATH("CCRBLD",CCRGLO,"//ContinuityOfCareRecord/Body")
+        . ; I DEBUG W "GOING TO BUILD CCR",!
+        . ; N CCRTMP
+        . ; D BUILD^GPLXPATH("CCRBLD","CCRTMP")
+        . ; I DEBUG F GPLI=1:1:CCRTMP(0) W CCRTMP(GPLI),!
+        . ; D CP^GPLXPATH("CCRTMP",CCRGLO)
         Q
         ;

ccr/trunk/p/GPLCCR0.m

@@ -91 +91 @@
 ;;<Code>
 ;;<Value>@@PROBLEMCODEVALUE@@</Value>
-;;<CodingSystem>@@PROBLEMCODINGSYSTEM@@ICD9CM</CodingSystem>
-;;<Version>@@PROBLEMCODINGVERSION@@2007</Version>
+;;<CodingSystem>ICD9CM</CodingSystem>
+;;<Version>@@PROBLEMCODINGVERSION@@</Version>
 ;;</Code>
 ;;</Description>

ccr/trunk/p/GPLPROBS.m

@@ -15 +15 @@
     D LIST^ORQQPL3(.RPCRSLT,DFN,"") ; CALL THE PROBLEM LIST RPC
     I '$D(RPCRSLT(0)) W "ERROR CALLING LIST^ORQQPL3 ",! Q
-    I DEBUG ZWR RPCRSLT
+    ZWR RPCRSLT
     S TVMAP=$NA(^TMP($J,"PROBVALS"))
     S TARYTMP=$NA(^TMP($J,"PROBARYTMP"))

ccr/trunk/p/GPLUNIT.m

@@ -17 +17 @@
         S ZARY(CNT)=TST ; put the test in the array
         I $D(ZARY(BAT))  D  ; NOT THE FIRST TEST IN BATTERY
-        . N II ; TEMP FOR ENDING TEST IN BATTERY
+        . N II,TN ; TEMP FOR ENDING TEST IN BATTERY
         . S II=$P(ZARY(BAT),"^",2)
         . S $P(ZARY(BAT),"^",2)=II+1
         I '$D(ZARY(BAT))  D  ; FIRST TEST IN THIS BATTERY
         . S ZARY(BAT)=CNT_"^"_CNT ; FIRST AND LAST TESTS IN BATTERY
-        . S ZARY("TESTS",BAT)="" ; PUT THE BATTERY IN THE TESTS INDEX
+        . ; S ZARY("TESTS",BAT)="" ; PUT THE BATTERY IN THE TESTS INDEX
+        . S TN=$NA(ZARY("TESTS"))
+        . D PUSH^GPLXPATH(TN,BAT)
         S ZARY(0)=CNT ; update the array counter
         Q
@@ -46 +48 @@
        . . I LINE?." "1";;>>".E  D  ; test case found
        . . . D ZT(.@ZARY,SECTION,$P(LINE,";;>>",2)) ; put the test in the array
-       S @ZARY@("ALL")="1"_"^"_@ZARY@(0) ; MAKE A BATTERY FOR ALL
+       ; S @ZARY@("ALL")="1"_"^"_@ZARY@(0) ; MAKE A BATTERY FOR ALL
        Q
        ;
 ZTEST(ZARY,WHICH)   ; try out the tests using a passed array ZTEST
-       N I,ZX,ZR,ZP
-       S DEBUG=0
-       I '$D(ZARY(WHICH))  D  ; TEST SECTION DOESN'T EXIST
-       . W "ERROR -- TEST SECTION DOESN'T EXIST -> ",WHICH,!
-       . Q ; EXIT
-       N FIRST,LAST
-       S FIRST=$P(ZARY(WHICH),"^",1)
-       S LAST=$P(ZARY(WHICH),"^",2)
-       F I=FIRST:1:LAST  D
-       . I ZARY(I)?1">"1.E  D  ; NOT A TEST, JUST RUN THE STATEMENT
-       . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
-       . . ;  W ZP,!
-       . . S ZX=ZP
-       . . W "RUNNING: "_ZP
-       . . X ZX
-       . . W "..SUCCESS: ",WHICH,!
-       . I ZARY(I)?1"?"1.E  D  ; THIS IS A TEST
-       . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
-       . . S ZX="S ZR="_ZP
-       . . W "TRYING: "_ZP
-       . . X ZX
-       . . W $S(ZR=1:"..PASSED ",1:"..FAILED "),!
-       . . I '$D(TPASSED) D  ; NOT INITIALIZED YET
-       . . . S TPASSED=0 S TFAILED=0
-       . . I ZR S TPASSED=TPASSED+1
-       . . I 'ZR S TFAILED=TFAILED+1
-       Q
-       ;
+        N I,ZX,ZR,ZP
+        S DEBUG=0
+        I WHICH="ALL" D  Q ; RUN ALL THE TESTS
+        . W "DOING ALL",! 
+        . N J,NT
+        . S NT=$NA(ZARY("TESTS"))
+        . W NT,@NT@(0),!
+        . F J=1:1:@NT@(0) D  ;
+        . . W @NT@(J),!
+        . . D ZTEST^GPLUNIT(@ZARY,@NT@(J))
+        I '$D(ZARY(WHICH))  D  ; TEST SECTION DOESN'T EXIST
+        . W "ERROR -- TEST SECTION DOESN'T EXIST -> ",WHICH,!
+        . Q ; EXIT
+        N FIRST,LAST
+        S FIRST=$P(ZARY(WHICH),"^",1)
+        S LAST=$P(ZARY(WHICH),"^",2)
+        F I=FIRST:1:LAST  D
+        . I ZARY(I)?1">"1.E  D  ; NOT A TEST, JUST RUN THE STATEMENT
+        . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
+        . . ;  W ZP,!
+        . . S ZX=ZP
+        . . W "RUNNING: "_ZP
+        . . X ZX
+        . . W "..SUCCESS: ",WHICH,!
+        . I ZARY(I)?1"?"1.E  D  ; THIS IS A TEST
+        . . S ZP=$E(ZARY(I),2,$L(ZARY(I)))
+        . . S ZX="S ZR="_ZP
+        . . W "TRYING: "_ZP
+        . . X ZX
+        . . W $S(ZR=1:"..PASSED ",1:"..FAILED "),!
+        . . I '$D(TPASSED) D  ; NOT INITIALIZED YET
+        . . . S TPASSED=0 S TFAILED=0
+        . . I ZR S TPASSED=TPASSED+1
+        . . I 'ZR S TFAILED=TFAILED+1
+        Q
+        ;
 TEST   ; RUN ALL THE TEST CASES
       N ZTMP

ccr/trunk/p/GPLXPATH.m

@@ -189 +189 @@
        . W "ERROR IN COPY BAD SOURCE LENGTH: ",CPSRC,!
        . Q
+       ; I '$D(@CPDEST@(0)) S @CPDEST@(0)=0 ; IF THE DEST IS EMPTY, INITIALIZE
        D QUEUE("CPINSTR",CPSRC,1,@CPSRC@(0)) ; BLIST FOR ENTIRE ARRAY
        D BUILD("CPINSTR",CPDEST)
@@ -238 +239 @@
        ; XML AT THE END OF THE XPATH POINT
        ; INSXML AND INSNEW ARE PASSED BY NAME INSXPATH IS A VALUE
-       ; N INSBLD,INSTMP
+       N INSBLD,INSTMP
        I DEBUG W "DOING INSERT ",INSXML,INSNEW,INSXPATH,!
        I DEBUG F G1=1:1:@INSXML@(0) W @INSXML@(G1),!
-       I '$D(@INSXML@(0)) D  ; INSERT INTO AN EMPTY ARRAY
-       . W "DOING A BAD COPY",!
-       . D CP^GPLXPATH(INSNEW,INXML) ; JUST COPY INTO THE OUTPUT
+       I '$D(@INSXML@(0)) D  Q ; INSERT INTO AN EMPTY ARRAY
+       . D CP^GPLXPATH(INSNEW,INSXML) ; JUST COPY INTO THE OUTPUT
        I $D(@INSXML@(0)) D  ; IF ORIGINAL ARRAY IS NOT EMPTY
-       . W "GOT HERE",!
        . I $D(INSXPATH) D  ; XPATH PROVIDED
        . . D QOPEN("INSBLD",INSXML,INSXPATH) ; COPY THE BEFORE
@@ -256 +255 @@
        . I '$D(INSXPATH) D  ; NO XPATH PROVIDED, CLOSE AT ROOT
        . . D QCLOSE("INSBLD",INSXML,"//") ; CLOSE WITH ROOT XPATH
-       . D BUILD("INSBLD",INSTMP) ; PUT RESULTS IN INDEST
-       . D CP^GPLXPATH(INSTMP,INSXML) ; COPY BUFFER TO SOURCE
+       . D BUILD("INSBLD","INSTMP") ; PUT RESULTS IN INDEST
+       . D CP^GPLXPATH("INSTMP",INSXML) ; COPY BUFFER TO SOURCE
        Q
        ;
@@ -335 +334 @@
       ;
 TEST   ; RUN ALL THE TEST CASES
-      N ZTMP
-      D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
-      D ZTEST^GPLUNIT(.ZTMP,"ALL")
-      W "PASSED: ",TPASSED,!
-      W "FAILED: ",TFAILED,!
-      W !
-      ; W "THE TESTS!",!
-      ; ZWR ZTMP
-      Q
-      ;
+        N ZTMP
+        D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
+        D ZTEST^GPLUNIT(.ZTMP,"ALL")
+        W "PASSED: ",TPASSED,!
+        W "FAILED: ",TFAILED,!
+        W !
+        ; W "THE TESTS!",!
+        ; ZWR ZTMP
+        Q
+        ;
 ZTEST(WHICH) ; RUN ONE SET OF TESTS
-      N ZTMP
-      D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
-      D ZTEST^GPLUNIT(.ZTMP,WHICH)
-      Q
-      ;
+        N ZTMP
+        S DEBUG=1
+        D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
+        D ZTEST^GPLUNIT(.ZTMP,WHICH)
+        Q
+        ;
 TLIST ; LIST THE TESTS
       N ZTMP
@@ -494 +494 @@
 ;;>>>D ZTEST^GPLXPATH("INITXML")
 ;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FIFTH","G2")
-;;>>>D INSERT^GPLXPATH("GXML","G2","G3","//FIRST/SECOND/THIRD")
-;;>>>D INSERT^GPLXPATH("G3","G2","G4","//FIRST/SECOND/THIRD")
-;;>>?G2(1)=G3(9)
+;;>>>D INSERT^GPLXPATH("GXML","G2","//FIRST/SECOND/THIRD")
+;;>>>D INSERT^GPLXPATH("G3","G2","//")
+;;>>?G2(1)=GXML(9)
 ;;><REPLACE>
 ;;>>>K G2,GBL,G3