Changeset 600

Timestamp:

Nov 5, 2009, 2:53:27 PM (14 years ago)

Author:

Christopher Edwards

Message:

Fixed double XML escaping/encoding and let MAP^{C0CXPATH handle it.}

File:

• ccr/trunk/p/C0CLABS.m (modified) (10 diffs)

ccr/trunk/p/C0CLABS.m

@@ -1 @@
-C0CALABS        ; CCDCCR/GPL - CCR/CCD PROCESSING FOR LAB RESULTS ; 10/01/08
+C0CALABS ; CCDCCR/GPL - CCR/CCD PROCESSING FOR LAB RESULTS ; 10/01/08
  ;;1.0;C0C;;May 19, 2009;
  ;Copyright 2008,2009 George Lilly, University of Minnesota.
@@ -19 +19 @@
  ;51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
            ;
-MAP(MIXML,DFN,MOXML)    ;TO MAKE THIS COMPATIBLE WITH OLD CALLING FOR EXTRACT
+MAP(MIXML,DFN,MOXML) ;TO MAKE THIS COMPATIBLE WITH OLD CALLING FOR EXTRACT
  ; ASSUMES THAT EXTRACT HAS BEEN RUN AND THE VARIABLES STORED IN MIVAR
  ; MIXML,MIVAR, AND MOXML ARE PASSED BY NAME
@@ -37 +37 @@
  Q
  ;
-RPCMAP(RTN,DFN,RMIVAR,RMIXML)   ; RPC ENTRY POINT FOR MAPPING RESULTS
+RPCMAP(RTN,DFN,RMIVAR,RMIXML) ; RPC ENTRY POINT FOR MAPPING RESULTS
  ; RTN IS PASSED BY REFERENCE
  ;N C0CT0,C0CT,C0CV ; CCR TEMPLATE, RESULTS SUBTEMPLATE, VARIABLES
@@ -114 +114 @@
  Q
  ;
-EXTRACT(ILXML,DFN,OLXML)        ; EXTRACT LABS INTO THE C0CLVAR GLOBAL
+EXTRACT(ILXML,DFN,OLXML) ; EXTRACT LABS INTO THE C0CLVAR GLOBAL
  ;
  ; LABXML AND LABOUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED
@@ -135 +135 @@
  Q
      ;
-GHL7    ; GET HL7 MESSAGE FOR LABS FOR THIS PATIENT
+GHL7 ; GET HL7 MESSAGE FOR LABS FOR THIS PATIENT
  ; N C0CPTID,C0CSPC,C0CSDT,C0CEDT,C0CR
  ; SET UP FOR LAB API CALL
@@ -155 +155 @@
  Q
  ;
-LIST    ; LIST THE HL7 MESSAGE; ALSO, EXTRACT THE RESULT VARIABLES TO C0CLB
+LIST ; LIST THE HL7 MESSAGE; ALSO, EXTRACT THE RESULT VARIABLES TO C0CLB
  ;
  ; N C0CI,C0CJ,C0COBT,C0CHB,C0CVAR
@@ -205 +205 @@
  . . . S XV("RESULTTESTDESCRIPTIONTEXT")=C0CVAR("C2") ; USE PRIMARY TEXT
  . . N C0CZG S C0CZG=XV("RESULTTESTNORMALDESCTEXT") ;
- . . S XV("RESULTTESTNORMALDESCTEXT")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
+ . . ; mod to remove local XML escaping rely upon MAP^C0CXPATH
+ . . ;S XV("RESULTTESTNORMALDESCTEXT")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
+ . . S XV("RESULTTESTNORMALDESCTEXT")=C0CZG
  . . S C0CZG=XV("RESULTTESTVALUE")
- . . S XV("RESULTTESTVALUE")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
+  . . ; mod to remove local XML escaping rely upon MAP^C0CXPATH
+ . . ;S XV("RESULTTESTVALUE")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
+ . . S XV("RESULTTESTVALUE")=C0CZG
  . I C0CTYP="OBX" D  ; PROCESS TEST RESULTS
  . . I C0CLOBX=0 D  ; FIRST TEST RESULT FOR THIS SECTION
@@ -229 +233 @@
  ;M ^TMP("C0CRIM","VARS",DFN,"RESULTS")=@C0CLB
  Q
-LTYP(OSEG,OTYP,OVARA,OC0CQT)    ;
+LTYP(OSEG,OTYP,OVARA,OC0CQT) ;
  S OTAB=$NA(@C0CTAB@(OTYP)) ; TABLE FOR SEGMENT TYPE
  I '$D(OC0CQT) S C0CQT=0 ; NOT C0CQT IS DEFAULT
@@ -246 +250 @@
  . . . I OV'="" W OI_": "_$P(@OTAB@(OI),"^",3),": ",OVAR,": ",OV,!
  Q
-LOBX    ;
- Q
- ;
-OUT(DFN)        ; WRITE OUT A CCR THAT HAS JUST BEEN PROCESSED (FOR TESTING)
+LOBX ;
+ Q
+ ;
+OUT(DFN) ; WRITE OUT A CCR THAT HAS JUST BEEN PROCESSED (FOR TESTING)
  N GA,GF,GD
  S GA=$NA(^TMP("C0CCCR",$J,DFN,"CCR",1))
@@ -257 +261 @@
  Q
  ;
-SETTBL  ;
+SETTBL ;
  K X ; CLEAR X
  S X("PID","PID1")="1^00104^Set ID - Patient ID"