Index: /ccr/trunk/p/CCRMEDS.m
===================================================================
--- /ccr/trunk/p/CCRMEDS.m	(revision 161)
+++ /ccr/trunk/p/CCRMEDS.m	(revision 162)
@@ -84,4 +84,5 @@
 	  . N NDFIEN S NDFIEN=$P(NDFDATA(20),U)
 	  . N VAPROD S VAPROD=$P(NDFDATA(22),U)
+	  . B:NDFIEN=""
 	  . N CONCDATA S CONCDATA=$$CPRS^PSNAPIS(NDFIEN,VAPROD)
 	  . S @MAP@("MEDFORMTEXT")=$P(CONCDATA,U,1)
@@ -159,5 +160,5 @@
 	  . N RESULT S RESULT=$NA(^TMP("GPLCCR",$J,"RESULT"))
 	  . K @RESULT
-	  . D MAP^GPLXPATH(INXML,MAP,RESULT)
+	  . D MAP^GPLXPATH($NA(INXML),MAP,RESULT)
 	  . D:MEDCOUNT=1 CP^GPLXPATH(RESULT,OUTXML) ; First one is a copy
 	  . D:MEDCOUNT>1 INSINNER^GPLXPATH(OUTXML,RESULT) ; AFTER THE FIRST, INSERT INNER XML
Index: /ccr/trunk/p/CCRUNIT.m
===================================================================
--- /ccr/trunk/p/CCRUNIT.m	(revision 161)
+++ /ccr/trunk/p/CCRUNIT.m	(revision 162)
@@ -13,9 +13,9 @@
         W "Getting Med Template into INXML using",!
         W "QUERY^GPLXPATH(T,XPATH,""INXML"")",!!
-        N INXML
         D QUERY^GPLXPATH(T,XPATH,"INXML")
-        W "Executing EXTRACT^CCRMEDS(""INXML"",DFN,OUTXML)",!
+        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^CCRMEDS("INXML",DFN,OUTXML)
+        D EXTRACT^CCRMEDS(.INXML,DFN,OUTXML)
         Q