Changeset 214

Timestamp:

Oct 10, 2008, 2:45:04 PM (16 years ago)

Author:

George Lilly

Message:

debug false multiples in ACTORS

Location:

ccr/trunk/p

Files:

• GPLACTOR.m (modified) (2 diffs)
• GPLCCR.m (modified) (3 diffs)

ccr/trunk/p/GPLACTOR.m

@@ -3 +3 @@
  ; Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
  ; General Public License See attached copy of the License.
- ; 
+ ;
  ; This program is free software; you can redistribute it and/or modify
  ; it under the terms of the GNU General Public License as published by
  ; the Free Software Foundation; either version 2 of the License, or
  ; (at your option) any later version.
- ; 
+ ;
  ; This program is distributed in the hope that it will be useful,
  ; but WITHOUT ANY WARRANTY; without even the implied warranty of
  ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  ; GNU General Public License for more details.
- ; 
+ ;
  ; You should have received a copy of the GNU General Public License along
  ; with this program; if not, write to the Free Software Foundation, Inc.,
@@ -68 +68 @@
  . ;
  . D INSINNER^GPLXPATH(AXML,"ATMP2") ; INSERT INTO ROOT
+ . K ATYP,AIEN,AOID ; BE SURE TO GET THE NEXT ONE
  ;
  N ACTTMP

ccr/trunk/p/GPLCCR.m

@@ -31 +31 @@
        ; DIR IS THE DIRECTORY, DEFAULTS IF NULL TO ^TMP("GPLCCR","ODIR")
        ; FN IS FILE NAME, DEFAULTS IF NULL
-       N CCRGLO
-       I '$D(DIR) S DIR=""
-       I '$D(FN) S FN=""
+       N CCRGLO,UDIR,UFN
+       I '$D(DIR) S UDIR=""
+       E  S UDIR=DIR
+       I '$D(FN) S UFN=""
+       E  S UFN=FN
        D CCRRPC(.CCRGLO,DFN,"CCR","","","")
        S OARY=$NA(^TMP("GPLCCR",$J,DFN,"CCR",1))
-       S ONAM=FN
-       I FN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_5.xml"
+       S ONAM=UFN
+       I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_5.xml"
        S ODIRGLB=$NA(^TMP("GPLCCR","ODIR"))
        I '$D(@ODIRGLB) D  ; IF NOT ODIR HAS BEEN SET
@@ -43 +45 @@
        . ;S @ODIRGLB="/home/cedwards/"
        . S @ODIRGLB="/opt/wv/p/"
-       S ODIR=DIR
-       I DIR="" S ODIR=@ODIRGLB
+       S ODIR=UDIR
+       I UDIR="" S ODIR=@ODIRGLB
        N ZY
        S ZY=$$OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
@@ -113 +115 @@
     . . D INSERT^GPLXPATH(CCRGLO,OXML,"//ContinuityOfCareRecord/Body")
     . . I DEBUG F GPLI=1:1:@OXML@(0) W @OXML@(GPLI),!
+    N ACTT,ATMP,ACTT2,ATMP2 ; TEMPORARY ARRAY SYMBOLS FOR ACTOR PROCESSING
     D ACTLST^GPLCCR(CCRGLO,ACTGLO) ; GEN THE ACTOR LIST
     D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Actors","ACTT")