Index: ccr/trunk/p/GPLACTORS.m
===================================================================
--- ccr/trunk/p/GPLACTORS.m	(revision 97)
+++ ccr/trunk/p/GPLACTORS.m	(revision 98)
@@ -1,3 +1,3 @@
-GPLACTORS ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
+GPLACTORS  ; CCDCCR/GPL - CCR/CCD PROCESSING FOR ACTORS ; 7/3/08
  ;;0.3;CCDCCR;nopatch;noreleasedate
  ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
@@ -32,7 +32,6 @@
   ; ^TMP(7542,1,"ACTORS",n)="ActorID^ActorType^ActorIEN"
   ; ActorType is an enum containing either "PROVIDER" "PATIENT" "SYSTEM"
-
   ; AXML is the output arrary, to contain XML.
-
+  ;
            N I,J,AMAP,AOID,ATYP,AIEN
            D CP^GPLXPATH(IPXML,AXML) ; MAKE A COPY OF ACTORS XML
@@ -69,4 +68,5 @@
            . D INSINNER^GPLXPATH(AXML,"ATMP2") ; INSERT INTO ROOT
            ;
+           N ACTTMP
            D MISSING^GPLXPATH(AXML,"ACTTMP") ; SEARCH XML FOR MISSING VARS
            I ACTTMP(0)>0  D  ; IF THERE ARE MISSING VARS -
@@ -79,5 +79,5 @@
      ;
      W "PROCESSING ACTOR PATIENT ",AIEN,!
-     ; N AMAP
+     N AMAP,ZX
      S AMAP=$NA(^TMP($J,"AMAP"))
      K @AMAP
Index: ccr/trunk/p/GPLCCR.m
===================================================================
--- ccr/trunk/p/GPLCCR.m	(revision 97)
+++ ccr/trunk/p/GPLCCR.m	(revision 98)
@@ -94,5 +94,5 @@
     D INSINNER^GPLXPATH(CCRGLO,"ACTT2","//ContinuityOfCareRecord/Actors")
     N TRIMI,J,DONE S DONE=0
-    F TRIMI=0:0 D  Q:DONE ; DELETE UNTIL ALL EMPTY ELEMENTS ARE GONE
+    F TRIMI=0:0 D  Q:DONE  ; DELETE UNTIL ALL EMPTY ELEMENTS ARE GONE
     . S J=$$TRIM^GPLXPATH(CCRGLO) ; DELETE EMPTY ELEMENTS
     . W "TRIMMED",J,!
Index: ccr/trunk/p/GPLRIMA.m
===================================================================
--- ccr/trunk/p/GPLRIMA.m	(revision 97)
+++ ccr/trunk/p/GPLRIMA.m	(revision 98)
@@ -49,7 +49,7 @@
     S RIMDFN=BEGDFN ; BEGIN WITH THE BEGDFN PATIENT
     I RIMDFN="" S RIMDFN=RESUME
-    I +RIMDFN=0 D  Q ; AT THE END OF THE PATIENTS
+    I +RIMDFN=0 D  Q  ; AT THE END OF THE PATIENTS
     . W "END OF PATIENT LIST, CALL RESET^GPLRIMA",!
-    F RIMI=1:1:DFNCNT  D  Q:+RIMDFN=0 ; FOR DFNCNT NUMBER OF PATIENTS OR END
+    F RIMI=1:1:DFNCNT  D  Q:+RIMDFN=0  ; FOR DFNCNT NUMBER OF PATIENTS OR END
     . D CCRRPC^GPLCCR(.CCRGLO,RIMDFN,"CCR","","","") ;PROCESS THE CCR
     . W RIMDFN,!
@@ -149,5 +149,5 @@
     I '$D(RIMBASE) D ASETUP ; FOR COMMANDLINE PROCESSING
     N USETBL
-    I '$D(@RIMBASE@("TABLES",PTBL)) D  Q ; NO TABLE
+    I '$D(@RIMBASE@("TABLES",PTBL)) D  Q  ; NO TABLE
     . W "ERROR NO SUCH TABLE",!
     S USETBL=@RIMBASE@("TABLES",PTBL)
Index: ccr/trunk/p/GPLXPATH.m
===================================================================
--- ccr/trunk/p/GPLXPATH.m	(revision 97)
+++ ccr/trunk/p/GPLXPATH.m	(revision 98)
@@ -321,5 +321,5 @@
          S XFIRST=$P(XNODE,"^",1)
          S XLAST=$P(XNODE,"^",2)
-         I RENEW="" D ; WE ARE DELETING A SECTION, MUST SAVE THE TAG
+         I RENEW="" D  ; WE ARE DELETING A SECTION, MUST SAVE THE TAG
          . D QUEUE("REBLD",REXML,1,XFIRST) ; THE BEFORE
          . D QUEUE("REBLD",REXML,XLAST,@REXML@(0)) ; THE REST
@@ -373,5 +373,5 @@
          . I @OXML@(I)?.E1"@@".E D  ; IS THERE A VARIABLE HERE?
          . . S TSTR=$P(@IXML@(I),"@@",1) ; INIT TO PART BEFORE VARS
-         . . F J=2:2:10  D  Q:$P(@IXML@(I),"@@",J+2)="" ; QUIT IF NO MORE VARS
+         . . F J=2:2:10  D  Q:$P(@IXML@(I),"@@",J+2)=""  ; QUIT IF NO MORE VARS
          . . . I DEBUG W "IN MAPPING LOOP: ",TSTR,!
          . . . S TNAM=$P(@OXML@(I),"@@",J) ; EXTRACT THE VARIABLE NAME