Index: ccr/trunk/p/C0CMXML.m
===================================================================
--- ccr/trunk/p/C0CMXML.m	(revision 572)
+++ ccr/trunk/p/C0CMXML.m	(revision 573)
@@ -21,5 +21,7 @@
  ;
 TEST ;
- S DOCID=$$PARSE("^GPL")
+ S C0CXMLIN=$NA(^TMP("C0CMXML",$J))
+ W $$FTG^%ZISH("/home/vademo2/EHR/p/","mxml-test.xml",$NA(@C0CXMLIN@(1)),3)
+ S C0CDOCID=$$PARSE(C0CXMLIN)
  S REDUX="//ContinuityOfCareRecord/Body"
  D XPATH(1,"/","GIDX","GARY",,REDUX)
@@ -48,5 +50,5 @@
  S @ZXIDX@(NEWPATH)=ZOID ; ADD THE XPATH FOR THIS NODE TO THE XPATH INDEX
  N GD S GD=$$DATA(ZOID) ; SEE IF THERE IS DATA FOR THIS NODE
- I GD'=0 S @ZXPARY@(NEWPATH)=GD ; IF YES, ADD IT TO THE XPATH ARRAY
+ I GD'="" S @ZXPARY@(NEWPATH)=GD ; IF YES, ADD IT TO THE XPATH ARRAY
  N ZFRST S ZFRST=$$FIRST(ZOID) ; SET FIRST CHILD
  I ZFRST'=0 D  ; THERE IS A CHILD
@@ -71,15 +73,17 @@
  ;
 FIRST(ZOID) ;RETURNS THE OID OF THE FIRST CHILD OF ZOID
- Q $$CHILD^MXMLDOM(DOCID,ZOID)
+ Q $$CHILD^MXMLDOM(C0CDOCID,ZOID)
  ;
 TAG(ZOID) ; RETURNS THE XML TAG FOR THE NODE
- Q $$NAME^MXMLDOM(DOCID,ZOID)
+ Q $$NAME^MXMLDOM(C0CDOCID,ZOID)
  ;
 NXTSIB(ZOID) ; RETURNS THE NEXT SIBLING
- Q $$SIBLING^MXMLDOM(DOCID,ZOID)
+ Q $$SIBLING^MXMLDOM(C0CDOCID,ZOID)
  ;
 DATA(ZOID) ; RETURNS DATA FOR THE NODE
  N ZT,ZN S ZT=""
- S ZN=$$TEXT^MXMLDOM(DOCID,ZOID,"ZT")
+ S C0CDOM=$NA(^TMP("MXMLDOM",$J,C0CDOCID))
+ Q $G(@C0CDOM@(ZOID,"T",1))
+ S ZN=$$TEXT^MXMLDOM(C0CDOCID,ZOID,"ZT")
  I $G(ZT) ZWR ZT
  Q $G(ZT)