Index: /ccr/trunk/p/C0CEWD1.m
===================================================================
--- /ccr/trunk/p/C0CEWD1.m	(revision 403)
+++ /ccr/trunk/p/C0CEWD1.m	(revision 404)
@@ -1,5 +1,5 @@
 C0CEWD1   ; CCDCCR/GPL - CCR FILEMAN utilities; 12/6/08
  ;;0.1;CCDCCR;nopatch;noreleasedate
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2009 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -33,5 +33,5 @@
  ;s ok=$$gtmImportFile^%zewdHTMLParser(zfilepath)
  s ok=$$LOAD(zfilepath) ;load the XML file to the EWD global
- s ok=$$parseDocument^%zewdHTMLParser("DerekDOM",0) 
+ s ok=$$parseDocument^%zewdHTMLParser("DerekDOM",0)
  ;s ok=$$parseXMLFile^%zewdAPI(zfilepath,"fourthDOM")
  w ok,!
@@ -39,5 +39,5 @@
  ;
 LOAD(filepath) ; load an xml file into the EWD global for DOM processing
- ; need to call s error=$$parseDocument^%zewdHTMLParser(docName,isHTML) 
+ ; need to call s error=$$parseDocument^%zewdHTMLParser(docName,isHTML)
  ; after to process it to the DOM - isHTML=0 for XML files
  n i
Index: /ccr/trunk/p/C0CFM1.m
===================================================================
--- /ccr/trunk/p/C0CFM1.m	(revision 403)
+++ /ccr/trunk/p/C0CFM1.m	(revision 404)
@@ -1,5 +1,5 @@
 C0CFM1   ; CCDCCR/GPL - CCR FILEMAN utilities; 12/6/08
  ;;0.1;CCDCCR;nopatch;noreleasedate
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2009 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -56,5 +56,5 @@
  S ZSRC=1 ; CCR SOURCE IS ASSUMED TO BE THIS EHR, WHICH IS ALWAYS SOURCE 1
  ; PUT THIS IN PARAMETERS - SO SOURCE NUMBER FOR PROCESSING IN CONFIGURABLE
- N ZF,ZFV S ZF=171.201 S ZFV=171.2012 
+ N ZF,ZFV S ZF=171.201 S ZFV=171.2012
  S ZSUBF=171.20122 ;FILE AND SUBFILE NUMBERS
  N ZSFV S ZSFV=171.201221 ; SUBFILE VARIABLE FILE NUMBER
@@ -94,5 +94,5 @@
  ;
 VARPTR(ZVAR,ZTYP) ;EXTRINSIC WHICH RETURNS THE POINTER TO ZVAR IN THE
- ; CCR DICTIONARY. IT IS LAYGO, AS IT WILL ADD THE VARIABLE TO 
+ ; CCR DICTIONARY. IT IS LAYGO, AS IT WILL ADD THE VARIABLE TO
  ; THE CCR DICTIONARY IF IT IS NOT THERE. ZTYP IS REQUIRED FOR LAYGO
  ;
@@ -114,8 +114,8 @@
  . . W "ADDED ",ZVAR," TO CCR DICTIONARY, IEN:",ZVARN,!
  Q ZVARN
- ; 
+ ;
 BLDTYPS ; ROUTINE TO POPULATE THE CCR NODE TYPES FILE (^C0CDIC(170.101,)
  ; THE CCR DICTIONARY (^C0CDIC(170, ) HAS MOST OF WHAT'S NEEDED
- ; 
+ ;
  N C0CDIC,C0CNODE ;
  S C0CDIC=$$FILEREF^C0CRNF(170) ; CLOSED FILE REFERENCE TO THE CCR DICTIONARY
@@ -135,5 +135,5 @@
  . . W "SECTION ",C0CI," VAR ",C0CZX
  . . S C0CV=$O(^C0CDIC(170.101,"B",C0CI,""))
- . . W " TYPE: ",C0CV,! 
+ . . W " TYPE: ",C0CV,!
  . . D SETFDA("SECTION",C0CV)
  . . ;ZWR C0CFDA
Index: /ccr/trunk/p/C0CFM2.m
===================================================================
--- /ccr/trunk/p/C0CFM2.m	(revision 403)
+++ /ccr/trunk/p/C0CFM2.m	(revision 404)
@@ -1,5 +1,5 @@
 C0CFM2   ; CCDCCR/GPL - CCR FILEMAN utilities; 12/6/08
  ;;0.1;CCDCCR;nopatch;noreleasedate
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2009 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -20,6 +20,6 @@
  W "This is the CCR FILEMAN Utility Library ",!
  ; THIS SET OF ROUTINES USE CCR E2 (^C0CE(, FILE 171.101) INSTEAD OF
- ; CCR ELEMENTS (^C0C(179.201, 
- ; E2 IS A SIMPLIFICATION OF CCR ELEMENTS WHERE SUB-ELEMENTS ARE 
+ ; CCR ELEMENTS (^C0C(179.201,
+ ; E2 IS A SIMPLIFICATION OF CCR ELEMENTS WHERE SUB-ELEMENTS ARE
  ; AT THE TOP LEVEL. OCCURANCE, THE 4TH PART OF THE KEY IS NOW FREE TEXT
  ; AND HAS THE FORM X;Y FOR SUB-ELEMENTS
@@ -104,8 +104,8 @@
  N ZTYPN S ZTYPN=$O(^C0CDIC(170.101,"B",ZTYPE,"")) ; FIND THE ELE TYPE
  S C0CFDA(C0CFTYP,"?+1,"_ZSRC_","_PATN_",",.01)=ZTYPN
- D UPDIE ; ADD THE ELEMENT TYPE 
+ D UPDIE ; ADD THE ELEMENT TYPE
  S ZTYP=$O(^C0CE(PATN,1,ZSRC,1,"B",ZTYPN,"")) ; IEN OF ELEMENT TYPE
  S C0CFDA(C0CFOCC,"?+1,"_ZTYP_","_ZSRC_","_PATN_",",.01)=" "_ZOCC ; STRING OCC
- ; OCC IS PRECEDED BY " " TO FORCE STRING STORAGE AND PRESERVE 
+ ; OCC IS PRECEDED BY " " TO FORCE STRING STORAGE AND PRESERVE
  ; STRING COLLATION ON THE INDEX
  D UPDIE ; ADD THE OCCURANCE
@@ -134,5 +134,5 @@
  . . ;S ZZVALS=$NA(@ZZVALS@(ZT)) ; PAST MULTIPLE TYPE INDICATOR
  . . ;W "MULTIPLE:",ZZVALS,!
- . . ;B 
+ . . ;B
  . . ;F  S ZZC0CI=$O(@ZZVALS@(ZZC0CI)) Q:ZZC0CI=""  D  ; EACH MULTIPLE
  . . ;. S ZZCNT=ZZCNT+1 ;INCREMENT COUNT
@@ -154,5 +154,5 @@
  K C0CFDA
  Q
- ; 
+ ;
 PUTELSOLD(DFN,ZTYPE,ZOCC,ZVALS) ; PUT CCR VALUES INTO THE CCR ELEMENTS FILE
  ; 171.101, ^C0CE  DFN IS THE PATIENT IEN PASSED BY VALUE
@@ -165,5 +165,5 @@
  S ZSRC=1 ; CCR SOURCE IS ASSUMED TO BE THIS EHR, WHICH IS ALWAYS SOURCE 1
  ; PUT THIS IN PARAMETERS - SO SOURCE NUMBER FOR PROCESSING IN CONFIGURABLE
- N ZF,ZFV S ZF=171.101 S ZFV=171.1011 
+ N ZF,ZFV S ZF=171.101 S ZFV=171.1011
  ;S ZSUBF=171.20122 ;FILE AND SUBFILE NUMBERS
  ;N ZSFV S ZSFV=171.201221 ; SUBFILE VARIABLE FILE NUMBER
@@ -210,5 +210,5 @@
  ;
 VARPTR(ZVAR,ZTYP) ;EXTRINSIC WHICH RETURNS THE POINTER TO ZVAR IN THE
- ; CCR DICTIONARY. IT IS LAYGO, AS IT WILL ADD THE VARIABLE TO 
+ ; CCR DICTIONARY. IT IS LAYGO, AS IT WILL ADD THE VARIABLE TO
  ; THE CCR DICTIONARY IF IT IS NOT THERE. ZTYP IS REQUIRED FOR LAYGO
  ;
@@ -230,8 +230,8 @@
  . . W "ADDED ",ZVAR," TO CCR DICTIONARY, IEN:",ZVARN,!
  Q ZVARN
- ; 
+ ;
 BLDTYPS ; ROUTINE TO POPULATE THE CCR NODE TYPES FILE (^C0CDIC(170.101,)
  ; THE CCR DICTIONARY (^C0CDIC(170, ) HAS MOST OF WHAT'S NEEDED
- ; 
+ ;
  N C0CDIC,C0CNODE ;
  S C0CDIC=$$FILEREF^C0CRNF(170) ; CLOSED FILE REFERENCE TO THE CCR DICTIONARY
@@ -251,5 +251,5 @@
  . . W "SECTION ",C0CI," VAR ",C0CZX
  . . S C0CV=$O(^C0CDIC(170.101,"B",C0CI,""))
- . . W " TYPE: ",C0CV,! 
+ . . W " TYPE: ",C0CV,!
  . . D SETFDA("SECTION",C0CV)
  . . ;ZWR C0CFDA
Index: /ccr/trunk/p/C0CFM3.m
===================================================================
--- /ccr/trunk/p/C0CFM3.m	(revision 403)
+++ /ccr/trunk/p/C0CFM3.m	(revision 404)
@@ -1,5 +1,5 @@
 C0CFM3   ; CCDCCR/GPL - CCR FILEMAN utilities; 12/6/08
  ;;0.1;CCDCCR;nopatch;noreleasedate
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2009 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -20,6 +20,6 @@
  W "This is the CCR FILEMAN Utility Library ",!
  ; THIS SET OF ROUTINES USE CCR E2 (^C0CE(, FILE 171.101) INSTEAD OF
- ; CCR ELEMENTS (^C0C(179.201, 
- ; E2 IS A SIMPLIFICATION OF CCR ELEMENTS WHERE SUB-ELEMENTS ARE 
+ ; CCR ELEMENTS (^C0C(179.201,
+ ; E2 IS A SIMPLIFICATION OF CCR ELEMENTS WHERE SUB-ELEMENTS ARE
  ; AT THE TOP LEVEL. OCCURANCE, THE 4TH PART OF THE KEY IS NOW FREE TEXT
  ; AND HAS THE FORM X;Y FOR SUB-ELEMENTS
@@ -121,5 +121,5 @@
  . . ;S ZZVALS=$NA(@ZZVALS@(ZT)) ; PAST MULTIPLE TYPE INDICATOR
  . . ;W "MULTIPLE:",ZZVALS,!
- . . ;B 
+ . . ;B
  . . ;F  S ZZC0CI=$O(@ZZVALS@(ZZC0CI)) Q:ZZC0CI=""  D  ; EACH MULTIPLE
  . . ;. S ZZCNT=ZZCNT+1 ;INCREMENT COUNT
@@ -141,5 +141,5 @@
  K C0CFDA
  Q
- ; 
+ ;
 PUTELSOLD(DFN,ZTYPE,ZOCC,ZVALS) ; PUT CCR VALUES INTO THE CCR ELEMENTS FILE
  ; 171.101, ^C0CE  DFN IS THE PATIENT IEN PASSED BY VALUE
@@ -152,5 +152,5 @@
  S ZSRC=1 ; CCR SOURCE IS ASSUMED TO BE THIS EHR, WHICH IS ALWAYS SOURCE 1
  ; PUT THIS IN PARAMETERS - SO SOURCE NUMBER FOR PROCESSING IN CONFIGURABLE
- N ZF,ZFV S ZF=171.101 S ZFV=171.1011 
+ N ZF,ZFV S ZF=171.101 S ZFV=171.1011
  ;S ZSUBF=171.20122 ;FILE AND SUBFILE NUMBERS
  ;N ZSFV S ZSFV=171.201221 ; SUBFILE VARIABLE FILE NUMBER
@@ -197,5 +197,5 @@
  ;
 VARPTR(ZVAR,ZTYP) ;EXTRINSIC WHICH RETURNS THE POINTER TO ZVAR IN THE
- ; CCR DICTIONARY. IT IS LAYGO, AS IT WILL ADD THE VARIABLE TO 
+ ; CCR DICTIONARY. IT IS LAYGO, AS IT WILL ADD THE VARIABLE TO
  ; THE CCR DICTIONARY IF IT IS NOT THERE. ZTYP IS REQUIRED FOR LAYGO
  ;
@@ -217,8 +217,8 @@
  . . W "ADDED ",ZVAR," TO CCR DICTIONARY, IEN:",ZVARN,!
  Q ZVARN
- ; 
+ ;
 BLDTYPS ; ROUTINE TO POPULATE THE CCR NODE TYPES FILE (^C0CDIC(170.101,)
  ; THE CCR DICTIONARY (^C0CDIC(170, ) HAS MOST OF WHAT'S NEEDED
- ; 
+ ;
  N C0CDIC,C0CNODE ;
  S C0CDIC=$$FILEREF^C0CRNF(170) ; CLOSED FILE REFERENCE TO THE CCR DICTIONARY
@@ -238,5 +238,5 @@
  . . W "SECTION ",C0CI," VAR ",C0CZX
  . . S C0CV=$O(^C0CDIC(170.101,"B",C0CI,""))
- . . W " TYPE: ",C0CV,! 
+ . . W " TYPE: ",C0CV,!
  . . D SETFDA("SECTION",C0CV)
  . . ;ZWR C0CFDA
Index: /ccr/trunk/p/C0CRNF.m
===================================================================
--- /ccr/trunk/p/C0CRNF.m	(revision 403)
+++ /ccr/trunk/p/C0CRNF.m	(revision 404)
@@ -1,5 +1,5 @@
 C0CRNF   ; CCDCCR/GPL - Reference Name Format (RNF) utilities; 12/6/08
  ;;0.1;CCDCCR;nopatch;noreleasedate
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2009 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -99,5 +99,5 @@
  . . . S GIEN=$QS(ZG,4) ; PULL OUT THE IEN
  . . E  S GIEN="" ; NOT FOUND IN INDEX
- . E  S GIEN="" ; 
+ . E  S GIEN="" ;
  ;W "IEN: ",GIEN,!
  ;N C0CTMP,C0CI,C0CJ,C0CREF,C0CNAME
@@ -163,5 +163,5 @@
  . . . S GIEN=$QS(ZG,4) ; PULL OUT THE IEN
  . . E  S GIEN="" ; NOT FOUND IN INDEX
- . E  S GIEN="" ; 
+ . E  S GIEN="" ;
  ;W "IEN: ",GIEN,!
  ;N C0CTMP,C0CI,C0CJ,C0CREF,C0CNAME
Index: /ccr/trunk/p/C0CRPMS.m
===================================================================
--- /ccr/trunk/p/C0CRPMS.m	(revision 403)
+++ /ccr/trunk/p/C0CRPMS.m	(revision 404)
@@ -1,5 +1,5 @@
-C0CRPMS	; CCDCCR/GPL - CCR/CCD PROCESSING FOR RPMS ;1/14/09  14:33
+C0CRPMS ; CCDCCR/GPL - CCR/CCD PROCESSING FOR RPMS ;1/14/09  14:33
  ;;0.1;CCDCCR;;JUL 16,2008;Build 7
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2008 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -37,8 +37,8 @@
  F  S G=$O(^AUPNVSIT("AA",C0CDFN,G)) Q:(G="")!(GN>C0CCNT)  D  ;
  . S GN=GN+1
- . W $$FMDTOUTC^C0CUTIL(9999999-G),! 
+ . W $$FMDTOUTC^C0CUTIL(9999999-G),!
  Q
  ;
-VISITS2(C0CDFN,C0CCNT) ;SECOND VERSION USING NEXTV 
+VISITS2(C0CDFN,C0CCNT) ;SECOND VERSION USING NEXTV
  ;
  N C0CG,GN
@@ -55,5 +55,5 @@
  ; RECENT VISIT
  N G
- S G=C0CVDT 
+ S G=C0CVDT
  I G'="" S G=9999999-C0CVDT ;INVERT FOR INDEX
  S G=$O(^AUPNVSIT("AA",C0CDFN,G))
Index: /ccr/trunk/p/C0CRXN.m
===================================================================
--- /ccr/trunk/p/C0CRXN.m	(revision 403)
+++ /ccr/trunk/p/C0CRXN.m	(revision 404)
@@ -1,5 +1,5 @@
 C0CRXN   ; CCDCCR/GPL - CCR RXN utilities; 12/6/08
  ;;0.1;CCDCCR;nopatch;noreleasedate
- ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
+ ;Copyright 2009 George Lilly.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
  ;
@@ -135,5 +135,5 @@
  . . D SETFDA("VAMAP","N") ;MARK AS MISSING FROM VA MAPPING FILE
  . ; NATIONAL DRUG FILE TESTS
- . I ($$ZVALUE("VUID","C0CD")=C0CZX)!($$ZVALUE("VUID","C0CE")=C0CZX) D  ; 
+ . I ($$ZVALUE("VUID","C0CD")=C0CZX)!($$ZVALUE("VUID","C0CE")=C0CZX) D  ;
  . . ;FOUND IN NATIONAL DRUG FILE OR DRUG INGREDIENT FILE
  . . S NDFVCNT=NDFVCNT+1 ;INCREMENT VUID FOUND COUNT