Index: ccr/trunk/p/CCRVA200.m
===================================================================
--- ccr/trunk/p/CCRVA200.m	(revision 65)
+++ ccr/trunk/p/CCRVA200.m	(revision 66)
@@ -1,5 +1,5 @@
 CCRVA200 ;WV/CCDCCR/SMH - Routine to get Provider Data;07/13/2008
 	;;0.1;CCDCCR;;JUL 13, 2007;Build 0
-
+	Q
 	; This routine uses Kernel APIs and Direct Global Access to get
 	; Proivder Data from File 200.
@@ -64,6 +64,6 @@
 	Q:+STR<0 ""
 	; Sometimes we have 3 pieces, or 2. Deal with that.
-	Q:$L($P(STR,U,4)) $P(STR,U,2)_"/"_$P(STR,U,3)_"/"_$P(STR,U,4)
-	Q $P(STR,U,2)_"/"_$P(STR,U,3)
+	Q:$L($P(STR,U,4)) $P(STR,U,2)_"-"_$P(STR,U,3)_"-"_$P(STR,U,4)
+	Q $P(STR,U,2)_"-"_$P(STR,U,3)
 	;
 ADDTYPE(DUZ) ; Get Address Type, PUBLIC; EXTRINSIC
@@ -72,3 +72,81 @@
 	Q "Work"
 	;
+ADDLINE1(DUZ) ; Get Address associated with this instituation; PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; Output: String.
 
+	; First, get site number from the institution file.
+	; 1st piece returned by $$SITE^VASITE, which gets the system institution
+	N INST S INST=$P($$SITE^VASITE(),U)
+
+	; Second, get mailing address
+	; There are two APIs to get the address, one for physical and one for 
+	; mailing. We will check if mailing exists first, since that's the
+	; one we want to use; then check for physical. If neither exists,
+	; then we return nothing. We check for the existence of an address
+	; by the length of the returned string.
+	; NOTE: API doesn't support Address 2, so I won't even include it
+	; in the template.
+	N ADD 
+	S ADD=$$MADD^XUAF4(INST) ; mailing address
+	Q:$L(ADD) $P(ADD,U)
+	S ADD=$$PADD^XUAF4(INST) ; physical address
+	Q:$L(ADD) $P(ADD,U)
+	Q ""
+	;
+CITY(DUZ) ; Get City for Institution. PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; Output: String.
+	; See ADD1 for comments
+	N INST S INST=$P($$SITE^VASITE(),U)
+	N ADD 
+	S ADD=$$MADD^XUAF4(INST) ; mailing address
+	Q:$L(ADD) $P(ADD,U,2)
+	S ADD=$$PADD^XUAF4(INST) ; physical address
+	Q:$L(ADD) $P(ADD,U,2)
+	Q ""
+	;
+STATE(DUZ) ; Get State for Institution. PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; Output: String.
+	; See ADD1 for comments
+	N INST S INST=$P($$SITE^VASITE(),U)
+	N ADD 
+	S ADD=$$MADD^XUAF4(INST) ; mailing address
+	Q:$L(ADD) $P(ADD,U,3)
+	S ADD=$$PADD^XUAF4(INST) ; physical address
+	Q:$L(ADD) $P(ADD,U,3)
+	Q ""
+	;
+POSTCODE(DUZ) ; Get Postal Code for Institution. PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; OUTPUT: String.
+	; See ADD1 for comments
+	N INST S INST=$P($$SITE^VASITE(),U)
+	N ADD 
+	S ADD=$$MADD^XUAF4(INST) ; mailing address
+	Q:$L(ADD) $P(ADD,U,4)
+	S ADD=$$PADD^XUAF4(INST) ; physical address
+	Q:$L(ADD) $P(ADD,U,4)
+	Q ""
+	;
+TEL(DUZ) ; Get Office Phone number. PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; OUTPUT: String.
+	; Direct global access
+	N TEL S TEL=$G(^VA(200,DUZ,.13))
+	Q $P(TEL,U,2)
+	;
+TELTYPE(DUZ) ; Get Telephone Type. PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; OUTPUT: String.
+	Q "Office"
+	;
+EMAIL(DUZ) ; Get Provider's Email. PUBLIC; EXTRINSIC
+	; INPUT: DUZ ByVal
+	; OUTPUT: String
+	; Direct global access
+	N EMAIL S EMAIL=$G(^VA(200,DUZ,.15))
+	Q $P(EMAIL,U)
+	;
+
Index: ccr/trunk/p/GPLCCR0.m
===================================================================
--- ccr/trunk/p/GPLCCR0.m	(revision 65)
+++ ccr/trunk/p/GPLCCR0.m	(revision 66)
@@ -1026,5 +1026,4 @@
  ;;</Type>
  ;;<Line1>@@ACTORADDRESSLINE1@@</Line1>
- ;;<Line2>@@ACTORADDRESSLINE2@@</Line2>
  ;;<City>@@ACTORADDRESSCITY@@</City>
  ;;<State>@@ACTORADDRESSSTATE@@</State>