Index: ccr/trunk/p/GPLACTORS.m
===================================================================
--- ccr/trunk/p/GPLACTORS.m	(revision 56)
+++ ccr/trunk/p/GPLACTORS.m	(revision 57)
@@ -3,19 +3,19 @@
            ;
            ;  PROCESS THE ACTORS SECTION OF THE CCR
-		   ;
-		   ; ===Revision History===
-		   ; 0.1 Initial Writing of Skeleton--GPL
-		   ; 0.2 Patient Data Extraction--SMH
-		   ; 0.3 Information System Info Extraction--SMH
+                   ;
+                   ; ===Revision History===
+                   ; 0.1 Initial Writing of Skeleton--GPL
+                   ; 0.2 Patient Data Extraction--SMH
+                   ; 0.3 Information System Info Extraction--SMH
            ;
 EXTRACT(IPXML,ALST,AXML) ; EXTRACT ACTOR FROM ALST INTO PROVIDED XML TEMPLATE
            ; IPXML is the Input Actor Template into which we are going to substitute values
-		   ; This is straight XML. Values to be substituted are in @@VAL@@ format.
-		    
-		   ; ALST is the actor list global generated by ACTLST^GPLCCR and is in the following format
-		   ; ^TMP(7542,1,"ACTORS",0)=Count
-		   ; ^TMP(7542,1,"ACTORS",n)="ActorID^ActorType^ActorIEN"
-		   ; ActorType is an enum containing either "PROVIDER" "PATIENT" "SYSTEM"
-		    
+                   ; This is straight XML. Values to be substituted are in @@VAL@@ format.
+
+                   ; ALST is the actor list global generated by ACTLST^GPLCCR and is in the following format
+                   ; ^TMP(7542,1,"ACTORS",0)=Count
+                   ; ^TMP(7542,1,"ACTORS",n)="ActorID^ActorType^ActorIEN"
+                   ; ActorType is an enum containing either "PROVIDER" "PATIENT" "SYSTEM"
+
            ; AXML is the output arrary, to contain XML.
 
@@ -48,4 +48,8 @@
            . . D PROVIDER("ATMP",@ALST@(I),"ATMP2")
            . ;
+           . I ATYP="ORGANIZATION" D  ; PROVIDER ACTOR TYPE
+           . . D QUERY^GPLXPATH(IPXML,"//Actors/ACTOR-ORG","ATMP")
+           . . D ORG("ATMP",@ALST@(I),"ATMP2")
+           . ;
            . D INSINNER^GPLXPATH(AXML,"ATMP2") ; INSERT INTO ROOT
            ;
@@ -62,5 +66,5 @@
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
-	 D INIT^CCRDPT(AIEN)
+         D INIT^CCRDPT(AIEN)
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ACTORGIVENNAME")=$$GIVEN^CCRDPT
@@ -79,8 +83,8 @@
      S @AMAP@("ACTORRESTEL")=$$RESTEL^CCRDPT
      S @AMAP@("ACTORWORKTEL")=$$WORKTEL^CCRDPT
-	 S @AMAP@("ACTORCELLTEL")=$$CELLTEL^CCRDPT
+         S @AMAP@("ACTORCELLTEL")=$$CELLTEL^CCRDPT
      S @AMAP@("ACTOREMAIL")=$$EMAIL^CCRDPT
      S @AMAP@("ACTORADDRESSSOURCEID")=AOID
-	 D DESTROY^CCRDPT
+         D DESTROY^CCRDPT
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
      Q
@@ -92,5 +96,5 @@
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
      S @AMAP@("ACTORINFOSYSNAME")=$$SYSNAME^CCRSYS
-	 S @AMAP@("ACTORINFOSYSVER")=$$SYSVER^CCRSYS
+         S @AMAP@("ACTORINFOSYSVER")=$$SYSVER^CCRSYS
      S @AMAP@("ACTORINFOSYSSOURCEID")=AOID
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
@@ -105,4 +109,14 @@
      S @AMAP@("ACTORRELATION")=""
      S @AMAP@("ACTORRELATIONSOURCEID")=""
+     D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
+     Q
+     ;
+ORG(INXML,ACTREC,OUTXML) ; PROCESS AN ORGANIZATION TYPE ACTOR
+     ;
+     ; N AMAP
+     S AMAP=$NA(^TMP($J,"AMAP"))
+     S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
+     S @AMAP@("ORGANIZATIONNAME")="WORLDVISTA EHR CLINIC"
+     S @AMAP@("ACTORSOURCEID")="ACTORSYSTEM_1"
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
      Q
Index: ccr/trunk/p/GPLCCR.m
===================================================================
--- ccr/trunk/p/GPLCCR.m	(revision 56)
+++ ccr/trunk/p/GPLCCR.m	(revision 57)
@@ -94,7 +94,9 @@
     I IHDR="" D  ; HEADER ARRAY IS NOT PROVIDED, USE DEFAULTS
     . S @VMAP@("ACTORPATIENT")="ACTORPATIENT_"_DFN
-    . S @VMAP@("ACTORFROM")="ACTORPROVIDER_"_DUZ ; FROM DUZ - ???
+    . S @VMAP@("ACTORFROM")="ACTORORGANIZATION_"_DUZ ; FROM DUZ - ???
     . S @VMAP@("ACTORFROM2")="ACTORSYSTEM_1" ; SECOND FROM IS THE SYSTEM
-    . S @VMAP@("ACTORTO")="ACTORPATIENT_"_DFN  ; FOR TEST PURPOSES,
+    . S @VMAP@("ACTORTO")="ACTORPATIENT_"_DFN  ; FOR TEST PURPOSES
+    . S @VMAP@("PURPOSEDESCRIPTION")="CEND PHR"  ; FOR TEST PURPOSES
+    . S @VMAP@("ACTORTOTEXT")="Patient"  ; FOR TEST PURPOSES
     . ; THIS IS THE USE CASE FOR THE PHR WHERE "TO" IS THE PATIENT
     I IHDR'="" D  ; HEADER VALUES ARE PROVIDED
Index: ccr/trunk/p/GPLCCR0.m
===================================================================
--- ccr/trunk/p/GPLCCR0.m	(revision 56)
+++ ccr/trunk/p/GPLCCR0.m	(revision 57)
@@ -573,4 +573,17 @@
  ;;</Actor>
  ;;</ACTOR-PROVIDER>
+ ;;<ACTOR-ORG>
+ ;;<Actor>
+ ;;<ActorObjectID>@@ACTOROBJECTID@@</ActorObjectID>
+ ;;<Organization>
+ ;;<Name>@@ORGANIZATIONNAME@@</Name>
+ ;;</Organization>
+ ;;<Source>
+ ;;<Actor>
+ ;;<ActorID>@@ACTORSOURCEID</ActorID>
+ ;;</Actor>
+ ;;</Source>
+ ;;</Actor>
+ ;;</ACTOR-ORG>
  ;;</Actors>
  ;;<Signatures>