Changeset 600


Ignore:
Timestamp:
Nov 5, 2009, 2:53:27 PM (15 years ago)
Author:
Christopher Edwards
Message:

Fixed double XML escaping/encoding and let MAPC0CXPATH handle it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ccr/trunk/p/C0CLABS.m

    r508 r600  
    1 C0CALABS        ; CCDCCR/GPL - CCR/CCD PROCESSING FOR LAB RESULTS ; 10/01/08
     1C0CALABS ; CCDCCR/GPL - CCR/CCD PROCESSING FOR LAB RESULTS ; 10/01/08
    22 ;;1.0;C0C;;May 19, 2009;
    33 ;Copyright 2008,2009 George Lilly, University of Minnesota.
     
    1919 ;51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
    2020           ;
    21 MAP(MIXML,DFN,MOXML)    ;TO MAKE THIS COMPATIBLE WITH OLD CALLING FOR EXTRACT
     21MAP(MIXML,DFN,MOXML) ;TO MAKE THIS COMPATIBLE WITH OLD CALLING FOR EXTRACT
    2222 ; ASSUMES THAT EXTRACT HAS BEEN RUN AND THE VARIABLES STORED IN MIVAR
    2323 ; MIXML,MIVAR, AND MOXML ARE PASSED BY NAME
     
    3737 Q
    3838 ;
    39 RPCMAP(RTN,DFN,RMIVAR,RMIXML)   ; RPC ENTRY POINT FOR MAPPING RESULTS
     39RPCMAP(RTN,DFN,RMIVAR,RMIXML) ; RPC ENTRY POINT FOR MAPPING RESULTS
    4040 ; RTN IS PASSED BY REFERENCE
    4141 ;N C0CT0,C0CT,C0CV ; CCR TEMPLATE, RESULTS SUBTEMPLATE, VARIABLES
     
    114114 Q
    115115 ;
    116 EXTRACT(ILXML,DFN,OLXML)        ; EXTRACT LABS INTO THE C0CLVAR GLOBAL
     116EXTRACT(ILXML,DFN,OLXML) ; EXTRACT LABS INTO THE C0CLVAR GLOBAL
    117117 ;
    118118 ; LABXML AND LABOUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED
     
    135135 Q
    136136     ;
    137 GHL7    ; GET HL7 MESSAGE FOR LABS FOR THIS PATIENT
     137GHL7 ; GET HL7 MESSAGE FOR LABS FOR THIS PATIENT
    138138 ; N C0CPTID,C0CSPC,C0CSDT,C0CEDT,C0CR
    139139 ; SET UP FOR LAB API CALL
     
    155155 Q
    156156 ;
    157 LIST    ; LIST THE HL7 MESSAGE; ALSO, EXTRACT THE RESULT VARIABLES TO C0CLB
     157LIST ; LIST THE HL7 MESSAGE; ALSO, EXTRACT THE RESULT VARIABLES TO C0CLB
    158158 ;
    159159 ; N C0CI,C0CJ,C0COBT,C0CHB,C0CVAR
     
    205205 . . . S XV("RESULTTESTDESCRIPTIONTEXT")=C0CVAR("C2") ; USE PRIMARY TEXT
    206206 . . N C0CZG S C0CZG=XV("RESULTTESTNORMALDESCTEXT") ;
    207  . . S XV("RESULTTESTNORMALDESCTEXT")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
     207 . . ; mod to remove local XML escaping rely upon MAP^C0CXPATH
     208 . . ;S XV("RESULTTESTNORMALDESCTEXT")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
     209 . . S XV("RESULTTESTNORMALDESCTEXT")=C0CZG
    208210 . . S C0CZG=XV("RESULTTESTVALUE")
    209  . . S XV("RESULTTESTVALUE")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
     211  . . ; mod to remove local XML escaping rely upon MAP^C0CXPATH
     212 . . ;S XV("RESULTTESTVALUE")=$$SYMENC^MXMLUTL(C0CZG) ;ESCAPE
     213 . . S XV("RESULTTESTVALUE")=C0CZG
    210214 . I C0CTYP="OBX" D  ; PROCESS TEST RESULTS
    211215 . . I C0CLOBX=0 D  ; FIRST TEST RESULT FOR THIS SECTION
     
    229233 ;M ^TMP("C0CRIM","VARS",DFN,"RESULTS")=@C0CLB
    230234 Q
    231 LTYP(OSEG,OTYP,OVARA,OC0CQT)    ;
     235LTYP(OSEG,OTYP,OVARA,OC0CQT) ;
    232236 S OTAB=$NA(@C0CTAB@(OTYP)) ; TABLE FOR SEGMENT TYPE
    233237 I '$D(OC0CQT) S C0CQT=0 ; NOT C0CQT IS DEFAULT
     
    246250 . . . I OV'="" W OI_": "_$P(@OTAB@(OI),"^",3),": ",OVAR,": ",OV,!
    247251 Q
    248 LOBX    ;
    249  Q
    250  ;
    251 OUT(DFN)        ; WRITE OUT A CCR THAT HAS JUST BEEN PROCESSED (FOR TESTING)
     252LOBX ;
     253 Q
     254 ;
     255OUT(DFN) ; WRITE OUT A CCR THAT HAS JUST BEEN PROCESSED (FOR TESTING)
    252256 N GA,GF,GD
    253257 S GA=$NA(^TMP("C0CCCR",$J,DFN,"CCR",1))
     
    257261 Q
    258262 ;
    259 SETTBL  ;
     263SETTBL ;
    260264 K X ; CLEAR X
    261265 S X("PID","PID1")="1^00104^Set ID - Patient ID"
Note: See TracChangeset for help on using the changeset viewer.