Changeset 75 for ccr/trunk/p/GPLACTORS.m

Timestamp:

Jul 26, 2008, 3:16:58 PM (16 years ago)

Author:

George Lilly

Message:

second CCD commit

File:

• ccr/trunk/p/GPLACTORS.m (modified) (6 diffs)

ccr/trunk/p/GPLACTORS.m

@@ -50 +50 @@
            . I ATYP="PATIENT" D  ; PATIENT ACTOR TYPE
            . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-PATIENT","ATMP")
-           . . D PATIENT("ATMP",@ALST@(I),"ATMP2")
+           . . D PATIENT("ATMP",AIEN,AOID,"ATMP2")
            . ;
            . I ATYP="SYSTEM" D  ; SYSTEM ACTOR TYPE
            . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-SYSTEM","ATMP")
-           . . D SYSTEM("ATMP",@ALST@(I),"ATMP2")
+           . . D SYSTEM("ATMP",AIEN,AOID,"ATMP2")
            . ;
            . I ATYP="NOK" D  ; NOK ACTOR TYPE
            . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-NOK","ATMP")
-           . . D NOK("ATMP",@ALST@(I),"ATMP2")
+           . . D NOK("ATMP",AIEN,AOID,"ATMP2")
            . ;
            . I ATYP="PROVIDER" D  ; PROVIDER ACTOR TYPE
            . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-PROVIDER","ATMP")
-           . . D PROVIDER("ATMP",@ALST@(I),"ATMP2")
+           . . D PROVIDER("ATMP",AIEN,AOID,"ATMP2")
            . ;
            . I ATYP="ORGANIZATION" D  ; PROVIDER ACTOR TYPE
            . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-ORG","ATMP")
-           . . D ORG("ATMP",@ALST@(I),"ATMP2")
+           . . D ORG("ATMP",AIEN,AOID,"ATMP2")
            . ;
            . D INSINNER^GPLXPATH(AXML,"ATMP2") ; INSERT INTO ROOT
@@ -77 +77 @@
            Q
            ;
-PATIENT(INXML,ACTREC,OUTXML) ; PROCESS A PATIENT ACTOR
+PATIENT(INXML,AIEN,AOID,OUTXML) ; PROCESS A PATIENT ACTOR
      ;
-     W "PROCESSING ACTOR PATIENT ",ACTREC,!
+     W "PROCESSING ACTOR PATIENT ",AIEN,!
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
+     K @AMAP
          D INIT^CCRDPT(AIEN)
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
@@ -102 +103 @@
      S @AMAP@("ACTOREMAIL")=$$EMAIL^CCRDPT
      S @AMAP@("ACTORADDRESSSOURCEID")=AOID
+     S @AMAP@("ACTORIEN")=AIEN
+     S @AMAP@("ACTORSUFFIXNAME")="" ; DOES VISTA STORE THE SUFFIX?
          D DESTROY^CCRDPT
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
      Q
      ;
-SYSTEM(INXML,ACTREC,OUTXML) ; PROCESS A SYSTEM ACTOR
+SYSTEM(INXML,AIEN,AOID,OUTXML) ; PROCESS A SYSTEM ACTOR
      ;
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
+     K @AMAP
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ACTORINFOSYSNAME")=$$SYSNAME^CCRSYS
@@ -117 +121 @@
      Q
      ;
-NOK(INXML,ACTREC,OUTXML) ; PROCESS A NEXT OF KIN TYPE ACTOR
+NOK(INXML,AIEN,AOID,OUTXML) ; PROCESS A NEXT OF KIN TYPE ACTOR
      ;
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
+     K @AMAP
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ACTORDISPLAYNAME")=""
@@ -128 +133 @@
      Q
      ;
-ORG(INXML,ACTREC,OUTXML) ; PROCESS AN ORGANIZATION TYPE ACTOR
+ORG(INXML,AIEN,AOID,OUTXML) ; PROCESS AN ORGANIZATION TYPE ACTOR
      ;
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
+     K @AMAP
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ORGANIZATIONNAME")=$P($$SITE^VASITE,U,2)
@@ -138 +144 @@
      Q
      ;
-PROVIDER(INXML,ACTREC,OUTXML) ; PROCESS A PROVIDER TYPE ACTOR
+PROVIDER(INXML,AIEN,AOID,OUTXML) ; PROCESS A PROVIDER TYPE ACTOR
      ;
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
+     K @AMAP
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ACTORGIVENNAME")=$$GIVEN^CCRVA200(AIEN)