Index: ccr/trunk/p/GPLCCR.m
===================================================================
--- ccr/trunk/p/GPLCCR.m	(revision 92)
+++ ccr/trunk/p/GPLCCR.m	(revision 93)
@@ -49,5 +49,5 @@
     ;    "TO" VARIABLES
     ;    IF NULL WILL DEFAULT TO "FROM" DUZ AND "TO" DFN
-    S DEBUG=0
+    I '$D(DEBUG) S DEBUG=0
     S CCD=0 ; NEED THIS FLAG TO DISTINGUISH FROM CCD
     I '$D(TESTLAB) S TESTLAB=0 ; FLAG FOR TESTING RESULTS SECTION
Index: ccr/trunk/p/GPLMEDS.m
===================================================================
--- ccr/trunk/p/GPLMEDS.m	(revision 92)
+++ ccr/trunk/p/GPLMEDS.m	(revision 93)
@@ -32,9 +32,9 @@
    . S @MEDOUTXML@(0)=0
    . Q
-   IF DEBUG ZWR MEDRSLT
+   I DEBUG ZWR MEDRSLT
    S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDICATIONS"))
    S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
    F J=1:3 Q:'$D(MEDRSLT(J))  D  ; FOR EACH MEDICATION IN THE LIST
-   . W "J IS ",J,!
+   . I DEBUG W "J IS ",J,!
    . S MEDVMAP=$NA(@MEDTVMAP@(J))
    . K @MEDVMAP
@@ -43,23 +43,26 @@
    . S @MEDVMAP@("MEDICATIONOBJECTID")="MED"_J ; UNIQUE OBJID FOR MEDS
    . ; PROCESSING FOR MEDS GOES HERE
-   . S @MEDVMAP@("MEDICATIONDATETIMETEXT")=$$FMDTOUTC^CCRUTIL($P(MEDPTMP,"^",11),"DT") ; GETS LAST FILL DATE
+   . S @MEDVMAP@("MEDISSUEDATETXT")=$$FMDTOUTC^CCRUTIL($P(MEDPTMP,"^",11),"DT") ; GETS LAST FILL DATE
    . S @MEDVMAP@("MEDICATIONDATETIMEAGE")=""
    . S @MEDVMAP@("MEDICATIONDATETIMEAGEUNITS")=""
-   . S @MEDVMAP@("MEDICATIONTYPETEXT")="Medication"
-   . S @MEDVMAP@("MEDICATIONSTATUSTEXT")=$P(MEDPTMP,"^",10) ; STATUS FROM RPC
-   . S @MEDVMAP@("MEDICATIONSOURCEACTORID")="ACTORSYSTEM_1"
-   . S @MEDVMAP@("MEDICATIONPRODUCTNAMETEXT")=$P(MEDPTMP,"^",3)
+   . S @MEDVMAP@("MEDTYPETEXT")="Medication"
+   . S @MEDVMAP@("MEDSTATUSTEXT")=$P(MEDPTMP,"^",10) ; STATUS FROM RPC
+   . S @MEDVMAP@("MEDSOURCEACTORID")="ACTORSYSTEM_1"
+   . S @MEDVMAP@("MEDPRODUCTNAMETEXT")=$P(MEDPTMP,"^",3)
    . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODEVALUE")=""
    . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODINGINGSYSTEM")=""
    . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODEVERSION")=""
-   . S @MEDVMAP@("MEDICATIONBRANDNAMETEXT")=""
+   . S @MEDVMAP@("MEDBRANDNAMETEXT")=""
    . S @MEDVMAP@("MEDICATIONBRANDNAMECODEVALUE")=""
    . S @MEDVMAP@("MEDICATIONBRANDNAMECODINGSYSTEM")=""
    . S @MEDVMAP@("MEDICATIONBRANDNAMECODEVERSION")=""
-   . S @MEDVMAP@("MEDICATIONSTRENGTHVALUE")=""
-   . S @MEDVMAP@("MEDICATIONSTRENGTHUNIT")=""
-   . S @MEDVMAP@("MEDICATIONFORMTEXT")=""
+   . S @MEDVMAP@("MEDSTRENGTHVALUE")=""
+   . S @MEDVMAP@("MEDSTRENGTHUNIT")=""
+   . S @MEDVMAP@("MEDFORMTEXT")=""
+   . S @MEDVMAP@("MEDQUANTITYVALUE")=""
+   . S @MEDVMAP@("MEDQUANTITYUNIT")=""
+   . S @MEDVMAP@("MEDRFNO")=""
    . S @MEDVMAP@("MEDICATIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+1)," *",2)
-   . S @MEDVMAP@("MEDICATIONDIRECTIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+2),"\ Sig: ",2)
+   . S @MEDVMAP@("MEDDIRECTIONDESCRIPTIONTEXT")=$P(MEDRSLT(J+2),"\ Sig: ",2)
    . S @MEDVMAP@("MEDICATIONDIRECTIONDOSEVALUE")=""
    . S @MEDVMAP@("MEDICATIONDIRECTIONROUTETEXT")=""
Index: ccr/trunk/p/GPLPROBS.m
===================================================================
--- ccr/trunk/p/GPLPROBS.m	(revision 92)
+++ ccr/trunk/p/GPLPROBS.m	(revision 93)
@@ -35,5 +35,5 @@
           . S @OUTXML@(0)=0
           . ; Q
-          ZWR RPCRSLT
+          I DEBUG ZWR RPCRSLT
           S TVMAP=$NA(^TMP("GPLCCR",$J,"PROBVALS"))
           S TARYTMP=$NA(^TMP("GPLCCR",$J,"PROBARYTMP"))
@@ -98,5 +98,5 @@
           . . . D CP^GPLXPATH("HTMLTMP","HTMLO")
           . . . ; D INSINNER^GPLXPATH("HOUT","HTMLO","//")
-          . D PARY^GPLXPATH("HTMLO")
+          . I DEBUG D PARY^GPLXPATH("HTMLO")
           . D INSB4^GPLXPATH(OUTXML,"HTMLO") ; INSERT AT TOP OF SECTION
           N PROBSTMP,I
Index: ccr/trunk/p/GPLVITALS.m
===================================================================
--- ccr/trunk/p/GPLVITALS.m	(revision 92)
+++ ccr/trunk/p/GPLVITALS.m	(revision 93)
@@ -166,5 +166,5 @@
           ; ZWR ^TMP($J,"VITALS",*)
           ZWR ^TMP($J,"VITALARYTMP",*) ; SHOW THE RESULTS
-          D PARY^GPLXPATH(VITOUTXML)
+          I DEBUG D PARY^GPLXPATH(VITOUTXML)
           N VITTMP,I
           D MISSING^GPLXPATH(VITOUTXML,"VITTMP") ; SEARCH XML FOR MISSING VARS