Changeset 76 for ccr/trunk/p/GPLXPATH.m

Timestamp:

Jul 27, 2008, 4:37:10 PM (16 years ago)

Author:

George Lilly

Message:

Fixed CCD structure, added Narrative to Problems

File:

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

ccr/trunk/p/GPLXPATH.m

@@ -299 +299 @@
          Q
          ;
+INSB4(XDEST,XNEW) ; INSERT XNEW AT THE BEGINNING OF XDEST
+        ; BUT XDEST AN XNEW ARE PASSED BY NAME
+        N XBLD,XTMP
+        D QUEUE("XBLD",XDEST,1,1) ; NEED TO PRESERVE SECTION ROOT
+        D QUEUE("XBLD",XNEW,1,@XNEW@(0)) ; ALL OF NEW XML FIRST
+        D QUEUE("XBLD",XDEST,2,@XDEST@(0)) ; FOLLOWED BY THE REST OF SECTION
+        D BUILD("XBLD","XTMP") ; BUILD THE RESULT
+        D CP("XTMP",XDEST) ; COPY TO THE DESTINATION
+        I DEBUG D PARY("XDEST")
+        Q
+        ;
 REPLACE(REXML,RENEW,REXPATH)    ; REPLACE THE XML AT THE XPATH POINT
          ; WITH RENEW - NOTE THIS WILL DELETE WHAT WAS THERE BEFORE
@@ -362 +373 @@
          . . S TSTR=$P(@IXML@(I),"@@",1) ; INIT TO PART BEFORE VARS
          . . F J=2:2:10  D  Q:$P(@IXML@(I),"@@",J+2)="" ; QUIT IF NO MORE VARS
-         . . . W "IN MAPPING LOOP: ",TSTR,!
+         . . . I DEBUG W "IN MAPPING LOOP: ",TSTR,!
          . . . S TNAM=$P(@OXML@(I),"@@",J) ; EXTRACT THE VARIABLE NAME
          . . . S TVAL="@@"_$P(@IXML@(I),"@@",J)_"@@" ; DEFAULT UNCHANGED
@@ -369 +380 @@
          . . . S TSTR=TSTR_TVAL_$P(@IXML@(I),"@@",J+1) ; ADD VAR AND PART AFTER
          . . S @OXML@(I)=TSTR ; COPY LINE WITH MAPPED VALUES
-         . . W TSTR
+         . . I DEBUG W TSTR
          W "MAPPED",!
          Q
@@ -375 +386 @@
 TRIM(THEXML) ; TAKES OUT ALL NULL ELEMENTS
        ; THEXML IS PASSED BY NAME
-       N I,J,TMPXML,DEL,FOUND
+       N I,J,TMPXML,DEL,FOUND,INTXT
        S FOUND=0
+       S INTXT=0
        W "DELETING EMPTY ELEMENTS",!
        F I=1:1:(@THEXML@(0)-1) D  ; LOOP THROUGH ENTIRE ARRAY
        . S J=@THEXML@(I)
+       . I J["<text>" D
+       . . S INTXT=1 ; IN HTML SECTION, DON'T TRIM
+       . . W "IN HTML SECTION",!
        . N JM,JP ; JMINUS AND JPLUS
        . S JM=@THEXML@(I-1) ; LINE BEFORE
+       . I JM["</text>" S INTXT=0 ; LEFT HTML SECTION,START TRIM
        . S JP=@THEXML@(I+1) ; LINE AFTER
-       . S JPX=$TR(JP,"/","") ; REMOVE THE SLASH
-       . I J=JPX D  ; AN EMPTY ELEMENT ON TWO LINES
-       . . W I,J,JP,!
-       . . S FOUND=1 ; FOUND SOMETHING TO BE DELETED
-       . . S DEL(I)="" ; SET LINE TO DELETE
-       . . S DEL(I+1)="" ; SET NEXT LINE TO DELETE
-       . I J["><" D  ; AN EMPTY ELEMENT ON ONE LINE
-       . . W I,J,!
-       . . S FOUND=1 ; FOUND SOMETHING TO BE DELETED
-       . . S DEL(I)="" ; SET THE EMPTY LINE UP TO BE DELETED
-       . . I JM=JPX D  ;
-       . . . W I,JM_J_JPX,!
-       . . . S DEL(I-1)=""
-       . . . S DEL(I+1)="" ; SET THE SURROUNDING LINES FOR DEL
+       . I INTXT=0 D  ; IF NOT IN AN HTML SECTION
+       . . S JPX=$TR(JP,"/","") ; REMOVE THE SLASH
+       . . I J=JPX D  ; AN EMPTY ELEMENT ON TWO LINES
+       . . . W I,J,JP,!
+       . . . S FOUND=1 ; FOUND SOMETHING TO BE DELETED
+       . . . S DEL(I)="" ; SET LINE TO DELETE
+       . . . S DEL(I+1)="" ; SET NEXT LINE TO DELETE
+       . . I J["><" D  ; AN EMPTY ELEMENT ON ONE LINE
+       . . . W I,J,!
+       . . . S FOUND=1 ; FOUND SOMETHING TO BE DELETED
+       . . . S DEL(I)="" ; SET THE EMPTY LINE UP TO BE DELETED
+       . . . I JM=JPX D  ;
+       . . . . W I,JM_J_JPX,!
+       . . . . S DEL(I-1)=""
+       . . . . S DEL(I+1)="" ; SET THE SURROUNDING LINES FOR DEL
        ; . I J'["><" D PUSH("TMPXML",J)
        I FOUND D  ; NEED TO DELETE THINGS
@@ -405 +422 @@
        Q FOUND
        ;
+UNMARK(XSEC) ; REMOVE MARKUP FROM FIRST AND LAST LINE OF XML
+        ; XSEC IS A SECTION PASSED BY NAME
+        N XBLD,XTMP
+        D QUEUE("XBLD",XSEC,2,@XSEC@(0)-1) ; BUILD LIST FOR INNER XML
+        D BUILD("XBLD","XTMP") ; BUILD THE RESULT
+        D CP("XTMP",XSEC) ; REPLACE PASSED XML
+        Q
+        ;
 PARY(GLO)       ;PRINT AN ARRAY
         N I