Changeset 135 for ccr/trunk

Timestamp:

Sep 3, 2008, 7:54:55 PM (16 years ago)

Author:

George Lilly

Message:

more extraneous write cleanup

Location:

ccr/trunk/p

Files:

• GPLACTOR.m (modified) (3 diffs)
• GPLCCR.m (modified) (4 diffs)
• GPLMEDS.m (modified) (1 diff)
• GPLPROBS.m (modified) (4 diffs)
• GPLVITAL.m (modified) (1 diff)

ccr/trunk/p/GPLACTOR.m

@@ -37 +37 @@
            D CP^GPLXPATH(IPXML,AXML) ; MAKE A COPY OF ACTORS XML
            D REPLACE^GPLXPATH(AXML,"","//Actors") ; DELETE THE INSIDES
-           W "PROCESSING ACTORS ",!
+           I DEBUG W "PROCESSING ACTORS ",!
            F I=1:1:@ALST@(0) D  ; PROCESS ALL ACTORS IN THE LIST
            . I @ALST@(I)["@@" Q  ; NOT A VALID ACTOR
@@ -45 +45 @@
            . I ATYP="" Q  ; NOT A VALID ACTOR
            . ;
-           . W AOID_" "_ATYP_" "_AIEN,!
+           . I DEBUG W AOID_" "_ATYP_" "_AIEN,!
            . I ATYP="PATIENT" D  ; PATIENT ACTOR TYPE
            . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-PATIENT","ATMP")
@@ -78 +78 @@
 PATIENT(INXML,AIEN,AOID,OUTXML) ; PROCESS A PATIENT ACTOR
      ;
-     W "PROCESSING ACTOR PATIENT ",AIEN,!
+     I DEBUG W "PROCESSING ACTOR PATIENT ",AIEN,!
      N AMAP,ZX
      S AMAP=$NA(^TMP($J,"AMAP"))

ccr/trunk/p/GPLCCR.m

@@ -94 +94 @@
     . ; W OXML,!
     . S CALL="D "_TAG_"^"_RTN_"(IXML,DFN,OXML)" ; SETUP THE CALL
-    . W "RUNNING ",CALL,!
+    . I DEBUG W "RUNNING ",CALL,!
     . X CALL
     . ; NOW INSERT THE RESULTS IN THE CCR BUFFER
@@ -107 +107 @@
     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,!
+    . I DEBUG W "TRIMMED",J,!
     . I J=0 S DONE=1 ; DONE WHEN TRIM RETURNS FALSE
     Q
@@ -113 +113 @@
 INITSTPS(TAB)  ; INITIALIZE CCR PROCESSING STEPS
     ; TAB IS PASSED BY NAME
-    W "TAB= ",TAB,!
+    I DEBUG W "TAB= ",TAB,!
     ; ORDER FOR CCR IS PROBLEMS,FAMILYHISTORY,SOCIALHISTORY,MEDICATIONS,VITALSIGNS,RESULTS,HEALTHCAREPROVIDERS
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLPROBS;//ContinuityOfCareRecord/Body/Problems;^TMP(""GPLCCR"",$J,DFN,""PROBLEMS"")")
@@ -153 +153 @@
     . I @AXML@(I)?.E1"<ActorID>".E D  ; THERE IS AN ACTOR THIS LINE
     . . S J=$P($P(@AXML@(I),"<ActorID>",2),"</ActorID>",1)
-    . . W "<ActorID>=>",J,!
+    . . I DEBUG W "<ActorID>=>",J,!
     . . I J'="" S K(J)="" ; HASHING ACTOR
     . . ;  TO GET RID OF DUPLICATES

ccr/trunk/p/GPLMEDS.m

@@ -84 +84 @@
    . I ZK>2 D  ; THIRD THROUGH 2+N LINES OF MED ARE INSTRUCTIONS
    . . N TMPTXT S TMPTXT="" ; BUILD UP INSTRUCTION LINE
-   . . S ZN=0 ; DON'T KNOW WHY
    . . F ZN=2:1:ZK-1 D  ; REMAINING LINES IN EACH MED
    . . . I MEDRSLT(ZJ+ZN)]"\ Sig: " D  ; REMOVE THIS MARKUP

ccr/trunk/p/GPLPROBS.m

@@ -42 +42 @@
           . S VMAP=$NA(@TVMAP@(J))
           . K @VMAP
-          . W "VMAP= ",VMAP,!
+          . I DEBUG W "VMAP= ",VMAP,!
           . S PTMP=RPCRSLT(J) ; PULL OUT PROBLEM FROM RPC RETURN ARRAY
           . S @VMAP@("PROBLEMOBJECTID")="PROBLEM"_J ; UNIQUE OBJID FOR PROBLEM
@@ -82 +82 @@
           . F GPLPROBI=1:1:RPCRSLT(0) D  ; FOR EACH PROBLEM
           . . S VMAP=$NA(@TVMAP@(GPLPROBI))
-          . . W "VMAP =",VMAP,!
+          . . I DEBUG W "VMAP =",VMAP,!
           . . D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Body/PROBLEMS-HTML","HTMP") ; GET THE HTML FROM THE TEMPLATE
           . . D UNMARK^GPLXPATH("HTMP") ; REMOVE <PROBLEMS-HTML> MARKUP
@@ -91 +91 @@
           . . . D CP^GPLXPATH("HOUT","HTMLO")
           . . I GPLPROBI>1 D  ; AFTER THE FIRST, INSERT INNER HTML
-          . . . W "DOING INNER",!
+          . . . I DEBUG W "DOING INNER",!
           . . . N HTMLBLD,HTMLTMP
           . . . D QUEUE^GPLXPATH("HTMLBLD","HTMLO",1,HTMLO(0)-1)
@@ -105 +105 @@
           I PROBSTMP(0)>0  D  ; IF THERE ARE MISSING VARS -
           . ; STRINGS MARKED AS @@X@@
-          . W "PROBLEMS Missing list: ",!
+          . W !,"PROBLEMS Missing list: ",!
           . F I=1:1:PROBSTMP(0) W PROBSTMP(I),!
           Q

ccr/trunk/p/GPLVITAL.m

@@ -171 +171 @@
           . . . ; W "FIRST ONE",!
           . . . D CP^GPLXPATH(VITARYTMP,VITOUTXML)
-          . . . W "VITOUTXML ",VITOUTXML,!
+          . . . I DEBUG W "VITOUTXML ",VITOUTXML,!
           . . I J>1 D  ; AFTER THE FIRST, INSERT INNER XML
           . . . D INSINNER^GPLXPATH(VITOUTXML,VITARYTMP)