Changeset 134 for ccr/trunk/p

Timestamp:

Sep 3, 2008, 6:26:54 PM (16 years ago)

Author:

George Lilly

Message:

cleaning up needless writes - make conditional on DEBUG

Location:

ccr/trunk/p

Files:

• GPLCCD.m (modified) (3 diffs)
• GPLCCR.m (modified) (1 diff)
• GPLXPATH.m (modified) (4 diffs)

ccr/trunk/p/GPLCCD.m

@@ -25 +25 @@
        I Y<1 Q  ; EXIT
        S DFN=$P(Y,U,1) ; SET THE PATIENT
+       D XPAT(DFN,"","") ; EXPORT TO A FILE
+       Q
+       ;
+XPAT(DFN,DIR,FN) ; EXPORT ONE PATIENT TO A FILE
+       ; DIR IS THE DIRECTORY, DEFAULTS IF NULL TO ^TMP("GPLCCR","ODIR")
+       ; FN IS FILE NAME, DEFAULTS IF NULL
        ; N CCDGLO
        D CCDRPC(.CCDGLO,DFN,"CCD","","","")
        S OARY=$NA(^TMP("GPLCCR",$J,DFN,"CCD",1))
-       S ONAM="PAT_"_DFN_"_CCD_V1.xml"
+       S ONAM=FN
+       I FN="" S ONAM="PAT_"_DFN_"_CCD_V1.xml"
        S ODIRGLB=$NA(^TMP("GPLCCR","ODIR"))
        I '$D(@ODIRGLB) D  ; IF NOT ODIR HAS BEEN SET
@@ -34 +41 @@
        . ;S @ODIRGLB="/home/cedwards/"
        . ;S @ODIRGLB="/opt/wv/p/"
-       S ODIR=@ODIRGLB
-       D OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
+       S ODIR=DIR
+       I DIR="" S ODIR=@ODIRGLB
+       N ZY
+       S ZY=$$OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
+       W $P(ZY,U,2)
        Q
        ;
@@ -49 +59 @@
     ;    "TO" VARIABLES
     ;    IF NULL WILL DEFAULT TO "FROM" ORGANIZATION AND "TO" DFN
-    S DEBUG=0
+    I '$D(DEBUG) S DEBUG=0
     N CCD S CCD=0 ; FLAG FOR PROCESSING A CCD
     I CCRPART="CCD" S CCD=1 ; WE ARE PROCESSING A CCD

ccr/trunk/p/GPLCCR.m

@@ -43 +43 @@
        S ODIR=DIR
        I DIR="" S ODIR=@ODIRGLB
-       D OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
+       N ZY
+       S ZY=$$OUTPUT^GPLXPATH(OARY,ONAM,ODIR)
+       W $P(ZY,U,2)
        Q
        ;

ccr/trunk/p/GPLXPATH.m

@@ -26 +26 @@
           N Y
           S Y=$$GTF^%ZISH(OUTARY,$QL(OUTARY),OUTDIR,OUTNAME)
-          I Y W "WROTE FILE: ",OUTNAME," TO ",OUTDIR,!
-          ; $NA(^TMP(14216,"FILE",0)),3,"/home/wvehr3","test.xml")
+          I Y Q 1_U_"WROTE FILE: "_OUTNAME_" TO "_OUTDIR
+          I 'Y Q 0_U_"ERROR WRITING FILE"_OUTNAME_" TO "_OUTDIR
           Q
           ;
@@ -366 +366 @@
          . . S @OXML@(I)=TSTR ; COPY LINE WITH MAPPED VALUES
          . . I DEBUG W TSTR
-         W "MAPPED",!
+         I DEBUG W "MAPPED",!
          Q
          ;
@@ -374 +374 @@
        S FOUND=0
        S INTXT=0
-       W "DELETING EMPTY ELEMENTS",!
+       I DEBUG W "DELETING EMPTY ELEMENTS",!
        F I=1:1:(@THEXML@(0)-1) D  ; LOOP THROUGH ENTIRE ARRAY
        . S J=@THEXML@(I)
        . I J["<text>" D
        . . S INTXT=1 ; IN HTML SECTION, DON'T TRIM
-       . . W "IN HTML SECTION",!
+       . . I DEBUG W "IN HTML SECTION",!
        . N JM,JP,JPX ; JMINUS AND JPLUS
        . S JM=@THEXML@(I-1) ; LINE BEFORE
@@ -387 +387 @@
        . . S JPX=$TR(JP,"/","") ; REMOVE THE SLASH
        . . I J=JPX D  ; AN EMPTY ELEMENT ON TWO LINES
-       . . . W I,J,JP,!
+       . . . I DEBUG W I,J,JP,!
        . . . S FOUND=1 ; FOUND SOMETHING TO BE DELETED
        . . . S DEL(I)="" ; SET LINE TO DELETE
        . . . S DEL(I+1)="" ; SET NEXT LINE TO DELETE
        . . I J["><" D  ; AN EMPTY ELEMENT ON ONE LINE
-       . . . W I,J,!
+       . . . I DEBUG W I,J,!
        . . . S FOUND=1 ; FOUND SOMETHING TO BE DELETED
        . . . S DEL(I)="" ; SET THE EMPTY LINE UP TO BE DELETED
        . . . I JM=JPX D  ;
-       . . . . W I,JM_J_JPX,!
+       . . . . I DEBUG W I,JM_J_JPX,!
        . . . . S DEL(I-1)=""
        . . . . S DEL(I+1)="" ; SET THE SURROUNDING LINES FOR DEL