Index: ccr/trunk/p/CCRMEDS6.m
===================================================================
--- ccr/trunk/p/CCRMEDS6.m	(revision 338)
+++ ccr/trunk/p/CCRMEDS6.m	(revision 339)
@@ -48,5 +48,5 @@
  ; If MEDS1 is not defined, then no meds
  I '$D(MEDS1) S @OUTXML@(0)=0 QUIT
- I DEBUG ZWR MEDS1
+ I DEBUG ZWR MEDS1,MINXML
  N MEDCNT S MEDCNT=0 ; Med Count
  ; The next line is a super line. It goes through the array return
@@ -204,7 +204,7 @@
  . . ; That's the same thing I am going to do.
  . . ; Search B index of 51.1 (Admin Schedule) with first abbr of schedule
- . . N SCHEDIEN=$$FIND1^DIC(51.1,,,$P(SIGDATA(7)," "),"B") 
+ . . N SCHEDIEN S SCHEDIEN=$$FIND1^DIC(51.1,,,$P(SIGDATA(7)," "),"B") 
  . . N INTERVAL S INTERVAL="" ; Default
- . . S:SCEHDIEN INTERVAL=$$GET1^DIQ(51.1,SCHEDIEN,2)
+ . . S:SCHEDIEN INTERVAL=$$GET1^DIQ(51.1,SCHEDIEN,2)
  . . S @MAP@("M","DIRECTIONS",DIRCNT,"MEDINTERVALVALUE")=INTERVAL
  . . S @MAP@("M","DIRECTIONS",DIRCNT,"MEDINTERVALUNIT")="Minute"
@@ -232,4 +232,5 @@
  . . ; If there is another entry in the FMSIG array (i.e. another line
  . . ; in the sig), set the direction count indicator.
+ . . S @MAP@("M","DIRECTIONS",DIRCNT,"MEDDIRSEQ")=""  ; Default
  . . S:+$O(FMSIG(FMSIGNUM)) @MAP@("M","DIRECTIONS",DIRCNT,"MEDDIRSEQ")=DIRCNT
  . . S @MAP@("M","DIRECTIONS",DIRCNT,"MEDMULDIRMOD")=SIGDATA(5)
@@ -242,5 +243,5 @@
  . N MEDPTIN1 S MEDPTIN1=$$GET1^DIQ(52,RXIEN,115,,"MEDPTIN1")
  . N MEDPTIN2,J  S (MEDPTIN2,J)="" 
- . F  S J=$O(@MEDPTIN1@(J)) Q:J=""  Q:$L(MEDPTIN2)>10000  S MEDPTIN2=MEDPTIN2_@MEDPTIN1@(J)_" "
+ . I $L(MEDPTIN1) F  S J=$O(@MEDPTIN1@(J)) Q:J=""  Q:$L(MEDPTIN2)>10000  S MEDPTIN2=MEDPTIN2_@MEDPTIN1@(J)_" "
  . S @MAP@("MEDPTINSTRUCTIONS")=MEDPTIN2
  . K J
@@ -248,5 +249,5 @@
  . N MEDPVIN1 S MEDPVIN1=$$GET1^DIQ(52,RXIEN,39,,"MEDPVIN1")
  . N MEDPVIN2,J S (MEDPVIN2,J)=""
- . F  S J=$O(@MEDPVIN1@(J)) Q:J=""  Q:$L(MEDPVIN2)>10000  S MEDPVIN2=MEDPVIN2_@MEDPVIN1@(J)_" "
+ . I $L(MEDPVIN1) F  S J=$O(@MEDPVIN1@(J)) Q:J=""  Q:$L(MEDPVIN2)>10000  S MEDPVIN2=MEDPVIN2_@MEDPVIN1@(J)_" "
  . S @MAP@("MEDFULLFILLMENTINSTRUCTIONS")=MEDPVIN2
  . ;
@@ -266,7 +267,8 @@
  . D REPLACE^GPLXPATH(RESULT,"","//Medications/Medication/Directions")
  . ; N MDZ1,MDZNA
- . I DIRCNT>0 D  ; IF THERE ARE DIRCTIONS
- . . F MDZ1=1:1:DIRCNT  D  ; FOR EACH DIRECTION
- . . . S MDZNA=$NA(@MAP@("M","DIRECTIONS",MDZ1))
+ . N DIRCNT S DIRCNT=""
+ . I +$O(@MAP@("M","DIRECTIONS",DIRCNT)) D  ; IF THERE ARE DIRCTIONS
+ . . F DIRCNT=$O(@MAP@("M","DIRECTIONS",DIRCNT)) D  ; FOR EACH DIRECTION
+ . . . S MDZNA=$NA(@MAP@("M","DIRECTIONS",DIRCNT))
  . . . D MAP^GPLXPATH(DIRXML1,MDZNA,DIRXML2)
  . . . D INSERT^GPLXPATH(RESULT,DIRXML2,"//Medications/Medication")
Index: ccr/trunk/p/CCRUNIT.m
===================================================================
--- ccr/trunk/p/CCRUNIT.m	(revision 338)
+++ ccr/trunk/p/CCRUNIT.m	(revision 339)
@@ -4,5 +4,5 @@
         ;
 MEDS
-        N DEBUG S DEBUG=1
+        N DEBUG S DEBUG=0
         N DFN S DFN=5685
         K ^TMP($J)
@@ -11,10 +11,11 @@
         N XPATH S XPATH="//ContinuityOfCareRecord/Body/Medications"
         W "XPATH is: "_XPATH,!
-        W "Getting Med Template into MINXML using",!
-        W "QUERY^GPLXPATH(T,XPATH,""MINXML"")",!!
-        D QUERY^GPLXPATH(T,XPATH,"MINXML")
-		W "Executing EXTRACT^CCRMEDS(MINXML,DFN,OUTXML)",!
+        W "Getting Med Template into INXML using",!
+        W "QUERY^GPLXPATH(T,XPATH,""INXML"")",!!
+        D QUERY^GPLXPATH(T,XPATH,"INXML")
+	B
+		W "Executing EXTRACT^CCRMEDS(INXML,DFN,OUTXML)",!
         W "OUTXML will be ^TMP($J,""OUT"")",!
         N OUTXML S OUTXML=$NA(^TMP($J,"OUT"))
-        D EXTRACT^CCRMEDS6($NA(MINXML),DFN,OUTXML)
+        D EXTRACT^CCRMEDS6("INXML",DFN,OUTXML)
         Q