Changeset 713 for ccr/trunk

Timestamp:

Feb 26, 2010, 9:53:06 AM (15 years ago)

Author:

George Lilly

Message:

updates to web services support

Location:

ccr/trunk/p

Files:

• C0CCCR.m (modified) (2 diffs)
• C0CMXP.m (modified) (4 diffs)
• C0CRIMA.m (modified) (1 diff)
• C0CSOAP.m (added)
• C0CXEWD.m (added)

ccr/trunk/p/C0CCCR.m

@@ -84 +84 @@
  I '$D(C0CNRPC) S ^TMP("C0CRPC",$H,"CALL",DFN)=""
  D SET^C0CPARMS(CCRPARMS) ;SET PARAMETERS WITH CCRPARMS AS OVERRIDES
+ I '$D(TESTVIT) S TESTVIT=0 ; FLAG FOR TESTING VITALS
  I '$D(TESTLAB) S TESTLAB=0 ; FLAG FOR TESTING RESULTS SECTION
  I '$D(TESTALERT) S TESTALERT=1 ; FLAG FOR TESTING ALERTS SECTION
@@ -149 +150 @@
  D PUSH^C0CXPATH(TAB,"EXTRACT;C0CMED;//ContinuityOfCareRecord/Body/Medications;^TMP(""C0CCCR"",$J,DFN,""MEDICATIONS"")")
  D PUSH^C0CXPATH(TAB,"MAP;C0CIMMU;//ContinuityOfCareRecord/Body/Immunizations;^TMP(""C0CCCR"",$J,DFN,""IMMUNE"")")
- D PUSH^C0CXPATH(TAB,"EXTRACT;C0CVITAL;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""C0CCCR"",$J,DFN,""VITALS"")")
+ I TESTVIT D PUSH^C0CXPATH(TAB,"EXTRACT;C0CVIT2;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""C0CCCR"",$J,DFN,""VITALS"")")
+ E  D PUSH^C0CXPATH(TAB,"EXTRACT;C0CVITAL;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""C0CCCR"",$J,DFN,""VITALS"")")
  D PUSH^C0CXPATH(TAB,"MAP;C0CLABS;//ContinuityOfCareRecord/Body/Results;^TMP(""C0CCCR"",$J,DFN,""RESULTS"")")
  D PUSH^C0CXPATH(TAB,"EXTRACT;C0CPROC;//ContinuityOfCareRecord/Body/Procedures;^TMP(""C0CCCR"",$J,DFN,""PROCEDURES"")")

ccr/trunk/p/C0CMXP.m

@@ -21 +21 @@
  ;
 INITXPF(ARY) ;INITIAL XML/XPATH FILE ARRAY
- ;
+ ; DON'T USE THIS ONE ... USE INITFARY^C0CSOAP("FARY") INSTEAD
+ D INITFARY^C0CSOAP(ARY) ;
  S @ARY@("XML FILE NUMBER")=178.101
  S @ARY@("XML SOURCE FIELD")=2.1
@@ -32 +33 @@
  ;
  S C0CXPF=@ARY@("XML FILE NUMBER")
- S C0CXFLD=@ARY@("XML SOURCE FIELD")
- S C0CXTFLD=@ARY@("XML TEMPLATE FIELD")
- S C0CXPBF=@ARY@("XPATH BINDING SUBFILE")
- S C0CRDUXF=@ARY@("REDUX FIELD")
+ S C0CXFLD=@ARY@("XML")
+ S C0CXTFLD=@ARY@("TEMPLATE XML")
+ S C0CXPBF=@ARY@("BINDING SUBFILE NUMBER")
+ S C0CRDUXF=@ARY@("XPATH REDUCTION STRING")
  Q
  ;
@@ -89 +90 @@
  Q
  ;
-COMPILE(INTID,UFARY) ; COMPILES AN XML TEMPLATE AND GENERATES XPATH BINDINGS
+COMPILE(TID,UFARY) ; COMPILES AN XML TEMPLATE AND GENERATES XPATH BINDINGS
  ; UFARY IF SPECIFIED WILL REDIRECT THE XML FILE TO USE
  ; INTID IS THE IEN OF THE RECORD TO USE IN THE XML FILE
@@ -96 +97 @@
  ; WILL BE POPULATED TO THE XPATH BINDINGS SUBFILE AS .01
  I '$D(UFARY) D  ;
- . S UFARY="UFARY" ; FILE ARRAY
- . D INITXPF("UFARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
+ . S UFARY="DEFFARY" ; FILE ARRAY
+ . ;D INITXPF("UFARY") ;IF FILE ARRAY NOT PASSED, INITIALIZE
+ . D INITFARY^C0CSOAP(UFARY)
  D SETXPF(UFARY) ;SET FILE VARIABLES
- B
+ I +TID=0 S INTID=$$RESTID^C0CSOAP(TID,UFARY)
+ E  S INTID=TID
+ ;B
  ;N C0CXML,C0CREDUX,C0CTEMP,C0CIDX
  D GETXML("C0CXML",INTID,UFARY)

ccr/trunk/p/C0CRIMA.m

@@ -459 +459 @@
  N ZZGI
  I WHICH="ALL" D  ; VARIABLES FROM ALL SECTIONS
- . F ZZGI="HEADER","PROBLEMS","VITALS","MEDS","ALERTS","RESULTS","IMMUNE" D  ;
+ . F ZZGI="HEADER","PROBLEMS","VITALS","MEDS","ALERTS","RESULTS","IMMUNE","PROCEDURES" D  ;
  . . D ZGVWRK(ZZGI) ; DO EACH SECTION
  . . I $G(DEBUG)'="" W "DID ",ZZGI,!