Changeset 974 for ccr/trunk/p/C0CCCR.m

Timestamp:

Oct 4, 2010, 1:46:18 PM (14 years ago)

Author:

George Lilly

Message:

modifications to clean up temp storage after processing

File:

• ccr/trunk/p/C0CCCR.m (modified) (5 diffs)

ccr/trunk/p/C0CCCR.m

@@ -41 +41 @@
  N C0CRTN  ; RETURN ARRAY
  D CCRRPC(.C0CRTN,DFN,XPARMS,"CCR")
- S OARY=$NA(^TMP("C0CCCR",$J,DFN,"CCR",1))
+ S OARY=$NA(^TMP("C0CCUR",$J,DFN,"CCR",1))
  S ONAM=UFN
  I UFN="" S ONAM="PAT_"_DFN_"_CCR_V1_0_0.xml"
@@ -62 +62 @@
  ;
  N G1
- S G1=$NA(^TMP("C0CCCR",$J,DFN,"CCR"))
+ S G1=$NA(^TMP("C0CCUR",$J,DFN,"CCR"))
  I $D(@G1@(0)) D  ; CCR EXISTS
  . D PARY^C0CXPATH(G1)
@@ -78 +78 @@
  ; SEE C0CPARMS FOR A COMPLETE LIST OF SUPPORTED PARAMETERS
  K ^TMP("C0CCCR",$J) ; CLEAN UP THE GLOBAL BEFORE WE USE IT
+ M ^TMP("C0CSAV",$J)=^TMP($J) ; SAVING CALLER'S TMP SETTINGS
+ K ^TMP($J) ; START CLEAN
  I '$D(DEBUG) S DEBUG=0
  S CCD=0 ; NEED THIS FLAG TO DISTINGUISH FROM CCD
@@ -89 +91 @@
  I '$D(TESTMEDS) S TESTMEDS=0 ; FLAG FOR TESTING C0CMED SECTION
  S TGLOBAL=$NA(^TMP("C0CCCR",$J,"TEMPLATE")) ; GLOBAL FOR STORING TEMPLATE
- S CCRGLO=$NA(^TMP("C0CCCR",$J,DFN,"CCR")) ; GLOBAL FOR BUILDING THE CCR
+ S CCRGLO=$NA(^TMP("C0CCUR",$J,DFN,"CCR")) ; GLOBAL FOR BUILDING THE CCR
  S ACTGLO=$NA(^TMP("C0CCCR",$J,DFN,"ACTORS")) ; GLOBAL FOR ALL ACTORS
  ; TO GET PART OF THE CCR RETURNED, PASS CCRPART="PROBLEMS" ETC
@@ -142 +144 @@
  . I J=0 S DONE=1 ; DONE WHEN TRIM RETURNS FALSE
  ;S CCRGRTN=$NA(^TMP("C0CCCR",$J,DFN,CCRPART)) ; RTN GLOBAL OF PART OR ALL
- M CCRGRTN=^TMP("C0CCCR",$J,DFN,CCRPART) ; RTN GLOBAL OF PART OR ALL
+ I CCRPART="CCR" M CCRGRTN=@CCRGLO ; ENTIRE CCR
+ E  M CCRGRTN=^TMP("C0CCCR",$J,DFN,CCRPART) ; RTN GLOBAL OF PART
  I '$D(C0CNRPC) S ^TMP("C0CRPC",$H,"RESULT",CCRGRTN(0))=""
- ;K ^TMP("C0CCCR",$J) ; BEGIN TO CLEAN UP
+ K ^TMP("C0CCCR",$J) ; BEGIN TO CLEAN UP
+ K ^TMP($J) ; REALLY CLEAN UP
+ M ^TMP($J)=^TMP("C0CSAV",$J) ; RESTORE CALLER'S $J
  Q
  ;