Changeset 646

Timestamp:

Dec 8, 2009, 5:29:27 PM (14 years ago)

Author:

George Lilly

Message:

improved xpath handling

Location:

ccr/trunk/p

Files:

• C0CIN.m (modified) (2 diffs)
• C0CMXML.m (modified) (1 diff)
• C0CMXP.m (modified) (1 diff)

ccr/trunk/p/C0CIN.m

@@ -111 +111 @@
  S ZI=""
  F  S ZI=$O(C0CXP(ZI)) Q:ZI=""  D  ; FOR EACH XPATH
- . D DEMUX("ZJ",ZI) ;
+ . D DEMUX^C0CMXP("ZJ",ZI) ;
  . W ZJ,!
  . S ZK=$P(ZJ,"^",3) ; PULL OUT THE XPATH
@@ -131 +131 @@
  D CCRRPC^C0CCCR(.ZT,C0CDFN,"LABLIMIT:T-1000")
  M @AOUT=ZT
- Q
- ;
-DEMUX(OUTX,INX) ;PARSES XPATH PASSED BY VALUE IN INX TO REMOVE [x] MULTIPLES
- ; RETURNS OUTX: MULTIPLE^SUBMULTIPLE^XPATH 
- N ZX,ZY,ZZ,ZZ1,ZMULT,ZSUB
- S (ZMULT,ZSUB)=""
- S ZX=$P(INX,"[",2)
- I ZX'="" D  ; THERE IS A [x] MULTIPLE
- . S ZY=$P(INX,"[",1) ;FIRST PART OF XPATH
- . S ZMULT=$P(ZX,"]",1) ; NUMBER OF THE MULTIPLE
- . S ZX=ZY_$P(ZX,"]",2) ; REST OF THE XPATH
- . I $P(ZX,"[",2)'="" D  ; A SUB MULTIPLE EXISTS
- . . S ZZ=$P(ZX,"[",1) ; FIRST PART OF XPATH
- . . S ZX=$P(ZX,"[",2) ; DELETE THE [
- . . S ZSUB=$P(ZX,"]",1) ; NUMBER OF THE SUBMULTIPLE
- . . S ZX=ZZ_$P(ZX,"]",2) ; REST OF THE XPATH
- E  S ZX=INX ;NO MULTIPLE HERE
- S @OUTX=ZMULT_"^"_ZSUB_"^"_ZX ;RETURN MULTIPLE^SUBMULTIPLE^XPATH
  Q
  ;

ccr/trunk/p/C0CMXML.m

@@ -181 +181 @@
  D END^C0CMXMLB ;END THE DOCUMENT
  M @ZRTN=^TMP("MXMLBLD",$J)
- K ^TMP("MXMLBLD",$J),^TMP("MXMLDOM",$J)
+ K ^TMP("MXMLBLD",$J)
  Q
  ;

ccr/trunk/p/C0CMXP.m

@@ -87 +87 @@
  Q
  ;
+DEMUX(OUTX,INX) ;PARSES XPATH PASSED BY VALUE IN INX TO REMOVE [x] MULTIPLES
+ ; RETURNS OUTX: MULTIPLE^SUBMULTIPLE^XPATH 
+ N ZX,ZY,ZZ,ZZ1,ZMULT,ZSUB
+ S (ZMULT,ZSUB)=""
+ S ZX=$P(INX,"[",2)
+ I ZX'="" D  ; THERE IS A [x] MULTIPLE
+ . S ZY=$P(INX,"[",1) ;FIRST PART OF XPATH
+ . S ZMULT=$P(ZX,"]",1) ; NUMBER OF THE MULTIPLE
+ . S ZX=ZY_$P(ZX,"]",2) ; REST OF THE XPATH
+ . I $P(ZX,"[",2)'="" D  ; A SUB MULTIPLE EXISTS
+ . . S ZZ=$P(ZX,"[",1) ; FIRST PART OF XPATH
+ . . S ZX=$P(ZX,"[",2) ; DELETE THE [
+ . . S ZSUB=$P(ZX,"]",1) ; NUMBER OF THE SUBMULTIPLE
+ . . S ZX=ZZ_$P(ZX,"]",2) ; REST OF THE XPATH
+ E  S ZX=INX ;NO MULTIPLE HERE
+ S @OUTX=ZMULT_"^"_ZSUB_"^"_ZX ;RETURN MULTIPLE^SUBMULTIPLE^XPATH
+ Q
+ ;
 UPDIE   ; INTERNAL ROUTINE TO CALL UPDATE^DIE AND CHECK FOR ERRORS
  K ZERR