Index: ccr/trunk/p/C0CRXN.m
===================================================================
--- ccr/trunk/p/C0CRXN.m	(revision 306)
+++ ccr/trunk/p/C0CRXN.m	(revision 307)
@@ -43,5 +43,5 @@
  . K C0CA,C0CB,C0CC ; CLEAR ARRAYS
  . D FIELDS^C0CRNF("C0CC",176.112) ;GET FIELD NAMES FOR OUTPUT FILE
- . D GETN2^C0CRNF("C0CA",176.111,C0CZX,"","ALL") ;GET THE FIELDS
+ . D GETN1^C0CRNF("C0CA",176.111,C0CZX,"","ALL") ;GET THE FIELDS
  . I $$ZVALUE("MEDIATION CODE")="" D
  . . S NORXN=NORXN+1 ;
@@ -54,5 +54,5 @@
  . E  D SETFDA("VUID TEXT",$$ZVALUE("VUID TEXT"))
  . . ;ZWR C0CA
- . D GETN2^C0CRNF("C0CB",176.001,$$ZVALUE("VUID"),"VUID","ALL")
+ . D GETN1^C0CRNF("C0CB",176.001,$$ZVALUE("VUID"),"VUID","ALL")
  . I $$ZVALUE("RXCUI","C0CB")'="" D  ; RXNORM FOUND
  . . S RXFOUND=RXFOUND+1
@@ -86,5 +86,5 @@
  ; CROSS CHECKS THE NATIONAL DRUG FILE AND THE VA MAPPING FILE AGAINST
  ; THE UMLS RXNORM DATABASE
- ; IF THE VUID EXISISTS IN ALL THREE FILES, THE RXNORM CODE MATCHES IN 
+ ; IF THE VUID EXISISTS IN ALL THREE FILES, THE RXNORM CODE MATCHES IN
  ; THE VA MAPPING FILE AND THE TEXT STRINGS ARE THE SAME, THE VUID IS INCLUDED
  ; IN THE FILE BUT NO FLAGS ARE SET
@@ -95,7 +95,7 @@
  ; IF THE TEXT STRINGS DO NOT MATCH EXACTLY, TXTM=N AND ALL THREE STRINGS
  ; ARE SHOWN; NDF TEXT=NDF TEXT STRING, VA MAP TEXT=VA MAPPING TEXT STRING
- ; RXNORM TEXT=RXNORM TEXT STRING 
+ ; RXNORM TEXT=RXNORM TEXT STRING
  ; THE FILE IS KEYED ON VUID AND WOULD USUALLY BE SORTED BY VUID
- ; THE OBJECTIVE IS TO SEE IF NDF (50.68) AND VA MAPPING (176.111) HAVE 
+ ; THE OBJECTIVE IS TO SEE IF NDF (50.68) AND VA MAPPING (176.111) HAVE
  ; ALL THE VUID CODES THAT ARE IN THE UMLS RXNORM DATABASE
  N C0CFDA,C0CA,C0CB,C0CC,C0CZX ;FDA WORK ARRAY, RNF ARRAYS, AND IEN ITERATOR
@@ -112,7 +112,7 @@
  . K C0CA,C0CB,C0CC,C0CD ; CLEAR ARRAYS
  . D FIELDS^C0CRNF("C0CC",176.113) ;GET FIELD NAMES FOR OUTPUT FILE
- . D GETN2^C0CRNF("C0CA",176.001,C0CZX,"VUID","ALL") ;GET FROM RXNORM FILE
- . D GETN2^C0CRNF("C0CB",176.111,C0CZX,"B","ALL") ;GET FROM VA MAPPING FILE
- . D GETN2^C0CRNF("C0CD",50.68,C0CZX,"AVUID","ALL") ;GET FROM NDF
+ . D GETN1^C0CRNF("C0CA",176.001,C0CZX,"VUID","ALL") ;GET FROM RXNORM FILE
+ . D GETN1^C0CRNF("C0CB",176.111,C0CZX,"B","ALL") ;GET FROM VA MAPPING FILE
+ . D GETN1^C0CRNF("C0CD",50.68,C0CZX,"AVUID","ALL") ;GET FROM NDF
  . ;D SETFDA("VUID",$$ZVALUE("CODE")) ;SET THE VUID CODE
  . D SETFDA("RXNORM",$$ZVALUE("RXCUI")) ;SET THE RXNORM CODE
@@ -134,5 +134,5 @@
  . . . S NDFTCNT=NDFTCNT+1 ; INCREMENT MISMATCHED NDF TEXT COUNT
  . . . D SETFDA("TXTM","N") ; SET TEXT MATCH FLAG TO N
- . . . D SETFDA("NDF TEXT",$$ZVALUE("NAME","C0CD")) ;POST THE TEXT 
+ . . . D SETFDA("NDF TEXT",$$ZVALUE("NAME","C0CD")) ;POST THE TEXT
  . E  D  ;
  . . D SETFDA("NDF","N") ;MARK AS MISSING
@@ -152,6 +152,6 @@
  ; USING THE AVUID INDEX, READS ALL VUID CODES IN ^PSNDF(50.68),
  ; CHECKS TO SEE IF THE CODE IS IN 176.001, AND CREATES A RECORD
- ; IN 176.114 
- ; THE OBJECTIVE IS TO SEE IF ^PSNDF(50.68) HAS ALL THE VUID CODES IN THE 
+ ; IN 176.114
+ ; THE OBJECTIVE IS TO SEE IF ^PSNDF(50.68) HAS ALL THE VUID CODES IN THE
  ; UMLS RXNORM DATABASE AND IF THE TEXT FIELDS MATCH
  ; ALSO CAPTURES THE RXNORM CODE MAPPING
@@ -173,9 +173,9 @@
  . K C0CA,C0CB,C0CC,C0CD ; CLEAR ARRAYS
  . ;D FIELDS^C0CRNF("C0CC",176.113) ;GET FIELD NAMES FOR OUTPUT FILE
- . D GETN2^C0CRNF("C0CA",50.68,C0CZX,"AVUID","ALL") ;GET THE FIELDS
+ . D GETN1^C0CRNF("C0CA",50.68,C0CZX,"AVUID","ALL") ;GET THE FIELDS
  . I $$ZVALUE("VUID")="" D  ; ERROR, SHOULD NOT HAPPEN
  . . S NOVUID=NOVUID+1 ; FLAG THE ERROR
  . . D PUSH^GPLXPATH("NOVUID",C0CZX) ; RECORD THE VUID
- . D GETN2^C0CRNF("C0CD",176.001,C0CZX,"VUID","ALL") ;TRY RXNORM DB
+ . D GETN1^C0CRNF("C0CD",176.001,C0CZX,"VUID","ALL") ;TRY RXNORM DB
  . I $$ZVALUE("CODE","C0CD")=C0CZX D  ; FOUND IN RXNORM
  . . S VMATCH=VMATCH+1 ; COUNT OF PSNDF VUIDS FOUND IN RXNORM
@@ -188,5 +188,5 @@
  . . . D PUSH^GPLXPATH("TXTNM",ZV) ; RECORD THE TXT MISMATCH
  . E  S NOMATCH=NOMATCH+1 ; NOT FOUND IN RXNORM
- . D GETN2^C0CRNF("C0CB",176.111,C0CZX,"B","ALL") ;TRY TO GET FROM 176.111
+ . D GETN1^C0CRNF("C0CB",176.111,C0CZX,"B","ALL") ;TRY TO GET FROM 176.111
  . I $$ZVALUE("VUID","C0CB")="" D  ; VUID NOT FOUND
  . . ;W "NOT FOUND: ",C0CZX," ",$$ZVALUE("STR")," ",$$ZVALUE("RXCUI"),!
@@ -199,5 +199,5 @@
  . . . S ZY=$$ZVALUE("VUID TEXT","C0CB")_"^"_$$ZVALUE("NAME") ;BOTH STRINGS
  . . . W "VA: ",ZY,!
- . . . D PUSH^GPLXPATH("NVAM",ZY) ;SAVE IT 
+ . . . D PUSH^GPLXPATH("NVAM",ZY) ;SAVE IT
  W "MISSING IN MAPPING FILE: ",MISSING,!
  W "FOUND IN MAPPING FILE: ",FOUND,!
@@ -217,5 +217,5 @@
  . E  D SETFDA("VUID TEXT",$$ZVALUE("VUID TEXT"))
  . . ;ZWR C0CA
- . D GETN2^C0CRNF("C0CB",176.001,$$ZVALUE("VUID"),"VUID","ALL")
+ . D GETN1^C0CRNF("C0CB",176.001,$$ZVALUE("VUID"),"VUID","ALL")
  . I $$ZVALUE("RXCUI","C0CB")'="" D  ; RXNORM FOUND
  . . S RXFOUND=RXFOUND+1
