Index: ccr/trunk/p/CCRDPT.m
===================================================================
--- ccr/trunk/p/CCRDPT.m	(revision 47)
+++ ccr/trunk/p/CCRDPT.m	(revision 48)
@@ -199,5 +199,5 @@
           Q $$NAMEFMT^XLFNAME(.NAME,"G","MXc") 
           ; "G" is Given Name First; "MXc" is Mixed Case, With Suffx Preceded by Comma
-OB() ; Date of Birth; PUBLIC; Extrinsic
+DOB() ; Date of Birth; PUBLIC; Extrinsic
           ; PREREQ: PT Defined
           Q:$G(PT(0))="" ""
Index: ccr/trunk/p/GPLACTORS.m
===================================================================
--- ccr/trunk/p/GPLACTORS.m	(revision 47)
+++ ccr/trunk/p/GPLACTORS.m	(revision 48)
@@ -5,5 +5,14 @@
            ;
 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"
+		    
+           ; AXML is the output arrary, to contain XML.
+
            N I,J,AMAP,AOID,ATYP,AIEN
            D CP^GPLXPATH(IPXML,AXML) ; MAKE A COPY OF ACTORS XML
@@ -11,9 +20,9 @@
            W "PROCESSING ACTORS ",!
            F I=1:1:@ALST@(0) D  ; PROCESS ALL ACTORS IN THE LIST
-           . I @ALST@(I)["@@" Q ; NOT A VALID ACTOR
+           . I @ALST@(I)["@@" Q  ; NOT A VALID ACTOR
            . S AOID=$P(@ALST@(I),"^",1) ; ACTOR OBJECT ID
            . S ATYP=$P(@ALST@(I),"^",2) ; ACTOR TYPE
            . S AIEN=$P(@ALST@(I),"^",3) ; ACTOR RECORD NUMBER
-           . I ATYP="" Q ; NOT A VALID ACTOR
+           . I ATYP="" Q  ; NOT A VALID ACTOR
            . ;
            . W AOID_" "_ATYP_" "_AIEN,!
@@ -48,22 +57,25 @@
      ; N AMAP
      S AMAP=$NA(^TMP($J,"AMAP"))
+	 D INIT^CCRDPT(AIEN)
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
-     S @AMAP@("ACTORGIVENNAME")=""
-     S @AMAP@("ACTORMIDDLENAME")=""
-     S @AMAP@("ACTORFAMILYNAME")=""
-     S @AMAP@("ACTORDATEOFBIRTH")=""
-     S @AMAP@("ACTORGENDER")=""
-     S @AMAP@("ACTORSSN")=""
-     S @AMAP@("ACTORSSNSOURCEID")=""
-     S @AMAP@("ACTORADDRESSTYPE")=""
-     S @AMAP@("ACTORADDRESSLINE1")=""
-     S @AMAP@("ACTORADDRESSLINE2")=""
-     S @AMAP@("ACTORADDRESSCITY")=""
-     S @AMAP@("ACTORADDRESSSTATE")=""
-     S @AMAP@("ACTORADDRESSZIPCODE")=""
-     S @AMAP@("ACTORTELEPHONE")=""
-     S @AMAP@("ACTORTELEPHONETYPE")=""
-     S @AMAP@("ACTOREMAIL")=""
-     S @AMAP@("ACTORADDRESSSOURCEID")=""
+     S @AMAP@("ACTORGIVENNAME")=$$GIVEN^CCRDPT
+     S @AMAP@("ACTORMIDDLENAME")=$$MIDDLE^CCRDPT
+     S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^CCRDPT
+     S @AMAP@("ACTORDATEOFBIRTH")=$$DOB^CCRDPT
+     S @AMAP@("ACTORGENDER")=$$GENDER^CCRDPT
+     S @AMAP@("ACTORSSN")=$$SSN^CCRDPT
+     S @AMAP@("ACTORSSNSOURCEID")=AOID
+     S @AMAP@("ACTORADDRESSTYPE")=$$ADDRTYPE^CCRDPT
+     S @AMAP@("ACTORADDRESSLINE1")=$$ADDR1^CCRDPT
+     S @AMAP@("ACTORADDRESSLINE2")=$$ADDR2^CCRDPT
+     S @AMAP@("ACTORADDRESSCITY")=$$CITY^CCRDPT
+     S @AMAP@("ACTORADDRESSSTATE")=$$STATE^CCRDPT
+     S @AMAP@("ACTORADDRESSZIPCODE")=$$ZIP^CCRDPT
+     S @AMAP@("ACTORRESTEL")=$$RESTEL^CCRDPT
+     S @AMAP@("ACTORWORKTEL")=$$WORKTEL^CCRDPT
+	 S @AMAP@("ACTORCELLTEL")=$$CELLTEL^CCRDPT
+     S @AMAP@("ACTOREMAIL")=$$EMAIL^CCRDPT
+     S @AMAP@("ACTORADDRESSSOURCEID")=AOID
+	 D DESTROY^CCRDPT
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
      Q
Index: ccr/trunk/p/GPLCCR0.m
===================================================================
--- ccr/trunk/p/GPLCCR0.m	(revision 47)
+++ ccr/trunk/p/GPLCCR0.m	(revision 48)
@@ -437,5 +437,9 @@
 ;;</DateOfBirth>
 ;;<Gender>
+;;<Code>
 ;;<Text>@@ACTORGENDER@@</Text>
+;;<Value>@@ACTORGENDER@@</Value>
+;;<CodingSystem>2.16.840.1.113883.5.1</CodingSystem>
+;;</Code>
 ;;</Gender>
 ;;</Person>
@@ -462,7 +466,19 @@
 ;;</Address>
 ;;<Telephone>
-;;<Value>@@ACTORTELEPHONE@@</Value>
-;;<Type>
-;;<Text>@@ACTORTELEPHONETYPE@@</Text>
+;;<Value>@@ACTORRESTEL@@</Value>
+;;<Type>
+;;<Text>Residential Telephone</Text>
+;;</Type>
+;;</Telephone>
+;;<Telephone>
+;;<Value>@@ACTORWORKTEL@@</Value>
+;;<Type>
+;;<Text>Work Telephone</Text>
+;;</Type>
+;;</Telephone>
+;;<Telephone>
+;;<Value>@@ACTORCELLTEL@@</Value>
+;;<Type>
+;;<Text>Cell phone</Text>
 ;;</Type>
 ;;</Telephone>