Index: /ccr/trunk/p/C0CMXP.m
===================================================================
--- /ccr/trunk/p/C0CMXP.m	(revision 717)
+++ /ccr/trunk/p/C0CMXP.m	(revision 718)
@@ -23,4 +23,5 @@
  ; DON'T USE THIS ONE ... USE INITFARY^C0CSOAP("FARY") INSTEAD
  D INITFARY^C0CSOAP(ARY) ;
+ Q
  S @ARY@("XML FILE NUMBER")=178.101
  S @ARY@("XML SOURCE FIELD")=2.1
@@ -52,28 +53,40 @@
  Q
  ;
-ADDXML(INXML,TEMPID,FARY) ;ADD XML TO A TEMPLATE ID TEMPID
+FIXICD9 ; FIX THE ICD9RESULT XML 
+ D GETXML("GPL","ICD9RESULT") ; GET SOME BAD XML OUT OF THE FILE
+ S ZI=""
+ S G=""
+ F  S ZI=$O(GPL(ZI)) Q:ZI=""  D  ; FOR EACH LINE
+ . S G=G_GPL(ZI) ; MAKE ONE BIG STRING OF XML
+ D NORMAL^C0CSOAP("G2","G") ;NO NORMALIZE IT BACK INTO AN ARRAY
+ D ADDXML("G2","ICD9RESULT") ; AND PUT IT BACK
+ Q
+ADDXML(INXML,TEMPID,INFARY) ;ADD XML TO A TEMPLATE ID TEMPID
  ; INXML IS PASSED BY NAME
- I '$D(FARY) D  ;
- . S FARY="FARY" ; FILE ARRAY
- . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
- D SETXPF(FARY) ;SET FILE VARIABLES
+ I '$D(INFARY) D  ;
+ . S INFARY="FARY" ; FILE ARRAY
+ . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
+ I +TEMPID=0 S TEMPID=$$RESTID^C0CSOAP(TEMPID,INFARY) ;RESOLVE TEMPLATE NAME
+ D SETXPF(INFARY) ;SET FILE VARIABLES
  D WP^DIE(C0CXPF,TEMPID_",",C0CXFLD,,INXML)
  Q
  ;
-ADDTEMP(INXML,TEMPID,FARY) ;ADD XML TEMPLATE TO TEMPLATE RECORD TEMPID FIELD 3
- ;
- I '$D(FARY) D  ;
- . S FARY="FARY" ; FILE ARRAY
- . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
- D SETXPF(FARY) ;SET FILE VARIABLES
+ADDTEMP(INXML,TEMPID,INFARY) ;ADD XML TEMPLATE TO TEMPLATE RECORD TEMPID
+ ;
+ I '$D(INFARY) D  ;
+ . S INFARY="FARY" ; FILE ARRAY
+ . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
+ I +TEMPID=0 S TEMPID=$$RESTID^C0CSOAP(TEMPID,INFARY) ;RESOLVE TEMPLATE NAME
+ D SETXPF(INFARY) ;SET FILE VARIABLES
  D WP^DIE(C0CXPF,TEMPID_",",C0CXTFLD,,INXML)
  Q
  ;
-GETXML(OUTXML,TEMPID,FARY) ;GET THE XML FROM TEMPLATE TEMPID
- ;
- I '$D(FARY) D  ;
- . S FARY="FARY" ; FILE ARRAY
- . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
- D SETXPF(FARY) ;SET FILE VARIABLES
+GETXML(OUTXML,TEMPID,INFARY) ;GET THE XML FROM TEMPLATE TEMPID
+ ;
+ I '$D(INFARY) D  ;
+ . S INFARY="FARY" ; FILE ARRAY
+ . D INITXPF("FARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
+ D SETXPF(INFARY) ;SET FILE VARIABLES
+ I +TEMPID=0 S TEMPID=$$RESTID^C0CSOAP(TEMPID,INFARY) ;RESOLVE TEMPLATE NAME
  I $$GET1^DIQ(C0CXPF,TEMPID_",",C0CXFLD,,OUTXML)'=OUTXML D  Q  ;
  . W "ERROR RETRIEVING TEMPLATE",!
Index: /ccr/trunk/p/C0CRNF.m
===================================================================
--- /ccr/trunk/p/C0CRNF.m	(revision 717)
+++ /ccr/trunk/p/C0CRNF.m	(revision 718)
@@ -37,5 +37,5 @@
  . . ;I C0CFN="STR" W C0CFN," ",C0CFJ,!
  . . I $D(@C0CFRTN@(C0CFN)) D  ; IS THIS A DUPLICATE?
- . . . I DEBUG D  ;
+ . . . I $G(DEBUG) D  ;
  . . . . W "DUPLICATE FOUND! ",C0CFJ," ",C0CFI," ",C0CFN,!,@C0CFRTN@(C0CFN),!
  . . . S @C0CFRTN@(C0CFN_"_"_C0CFJ)=C0CFJ_"^"_C0CFI
Index: /ccr/trunk/p/C0CSOAP.m
===================================================================
--- /ccr/trunk/p/C0CSOAP.m	(revision 717)
+++ /ccr/trunk/p/C0CSOAP.m	(revision 718)
@@ -52,4 +52,7 @@
 RESTID(INNAM,INFARY) ;EXTRINSIC TO RESOLVE TEMPLATE PASSED BY NAME
  ; FILE IS IDENTIFIED IN FARY, PASSED BY NAME
+ I '$D(INFARY) D  ; NO FILE ARRAY PASSED
+ . S INFARY="FARY"
+ . D INITFARY(INFARY)
  N ZN,ZREF,ZR
  S ZN=@INFARY@("XML FILE NUMBER")