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

Timestamp:

Jul 26, 2008, 3:16:58 PM (16 years ago)

Author:

George Lilly

Message:

second CCD commit

File:

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

ccr/trunk/p/GPLXPATH.m

@@ -309 +309 @@
          S XFIRST=$P(XNODE,"^",1)
          S XLAST=$P(XNODE,"^",2)
-         D QUEUE("REBLD",REXML,1,XFIRST) ; THE BEFORE
+         I RENEW="" D ; WE ARE DELETING A SECTION, MUST SAVE THE TAG
+         . D QUEUE("REBLD",REXML,1,XFIRST) ; THE BEFORE
+         . D QUEUE("REBLD",REXML,XLAST,@REXML@(0)) ; THE REST
          I RENEW'="" D  ; NEW XML IS NOT NULL
+         . D QUEUE("REBLD",REXML,1,XFIRST-1) ; THE BEFORE
          . D QUEUE("REBLD",RENEW,1,@RENEW@(0)) ; THE NEW
-         D QUEUE("REBLD",REXML,XLAST,@REXML@(0)) ; THE REST
-         I DEBUG W "REPALCE PREBUILD",!
+         . D QUEUE("REBLD",REXML,XLAST+1,@REXML@(0)) ; THE REST
+         I DEBUG W "REPLACE PREBUILD",!
          I DEBUG D PARY("REBLD")
          D BUILD("REBLD","RTMP")
@@ -361 +364 @@
          . . . W "IN MAPPING LOOP: ",TSTR,!
          . . . S TNAM=$P(@OXML@(I),"@@",J) ; EXTRACT THE VARIABLE NAME
-         . . . S TVAL="" ; DEFAULT FOR UNMAPPED VARIABLES
+         . . . S TVAL="@@"_$P(@IXML@(I),"@@",J)_"@@" ; DEFAULT UNCHANGED
          . . . I $D(@INARY@(TNAM))  D  ; IS THE VARIABLE IN THE MAP?
          . . . . S TVAL=@INARY@(TNAM) ; PULL OUT MAPPED VALUE