Changes in ccr/trunk/p/GPLXPATH.m [27:3]

File:

• ccr/trunk/p/GPLXPATH.m (modified) (9 diffs)

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)
@@ -239 +238 @@
        ; 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  Q ; INSERT INTO AN EMPTY ARRAY
-       . D CP^GPLXPATH(INSNEW,INSXML) ; JUST COPY INTO THE OUTPUT
+       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  ; IF ORIGINAL ARRAY IS NOT EMPTY
+       . W "GOT HERE",!
        . I $D(INSXPATH) D  ; XPATH PROVIDED
        . . D QOPEN("INSBLD",INSXML,INSXPATH) ; COPY THE BEFORE
@@ -255 +256 @@
        . 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
        ;
@@ -333 +334 @@
       Q
       ;
-TEST  ; Run all the test cases
-      D TESTALL^GPLUNIT("GPLXPATH")
+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
       ;
-OLDTEST   ; 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
-        ;
 ZTEST(WHICH) ; RUN ONE SET OF TESTS
-        N ZTMP
-        S DEBUG=1
-        D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
-        D ZTEST^GPLUNIT(.ZTMP,WHICH)
-        Q
-        ;
+      N ZTMP
+      D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
+      D ZTEST^GPLUNIT(.ZTMP,WHICH)
+      Q
+      ;
 TLIST ; LIST THE TESTS
       N ZTMP
@@ -469 +465 @@
 ;;>>>D ZTEST^GPLXPATH("INITXML")
 ;;>>>D QOPEN^GPLXPATH("GBL","GXML")
-;;>>?$P(GBL(1),";",3)=12
+;;>>?$P(GBL(1),"^",3)=12
 ;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</SECOND>"
@@ -476 +472 @@
 ;;>>>D ZTEST^GPLXPATH("INITXML")
 ;;>>>D QOPEN^GPLXPATH("GBL","GXML","//FIRST/SECOND")
-;;>>?$P(GBL(1),";",3)=11
+;;>>?$P(GBL(1),"^",3)=12
 ;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</SECOND>"
@@ -483 +479 @@
 ;;>>>D ZTEST^GPLXPATH("INITXML")
 ;;>>>D QCLOSE^GPLXPATH("GBL","GXML")
-;;>>?$P(GBL(1),";",3)=13
+;;>>?$P(GBL(1),"^",3)=13
 ;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</FIRST>"
@@ -490 +486 @@
 ;;>>>D ZTEST^GPLXPATH("INITXML")
 ;;>>>D QCLOSE^GPLXPATH("GBL","GXML","//FIRST/SECOND/THIRD")
-;;>>?$P(GBL(1),";",3)=13
+;;>>?$P(GBL(1),"^",3)=13
 ;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</FIRST>"
@@ -498 +494 @@
 ;;>>>D ZTEST^GPLXPATH("INITXML")
 ;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FIFTH","G2")
-;;>>>D INSERT^GPLXPATH("GXML","G2","//FIRST/SECOND/THIRD")
-;;>>>D INSERT^GPLXPATH("G3","G2","//")
-;;>>?G2(1)=GXML(9)
+;;>>>D INSERT^GPLXPATH("GXML","G2","G3","//FIRST/SECOND/THIRD")
+;;>>>D INSERT^GPLXPATH("G3","G2","G4","//FIRST/SECOND/THIRD")
+;;>>?G2(1)=G3(9)
 ;;><REPLACE>
 ;;>>>K G2,GBL,G3