Index: ccr/trunk/labRPMS/C0CLA7Q.m
===================================================================
--- ccr/trunk/labRPMS/C0CLA7Q.m	(revision 445)
+++ ccr/trunk/labRPMS/C0CLA7Q.m	(revision 446)
@@ -1,3 +1,3 @@
-C0CLA7Q	;WV/JMC - CCD/CCR Lab HL7 Query Utility ;Apr 21, 2009
+C0CLA7Q	;WV/JMC - CCD/CCR Lab HL7 Query Utility ;May 4, 2009
 	;;n.n;;****;
 	;
@@ -54,4 +54,5 @@
 	. S C0CDA=$QS(C0CROOT,4)
 	. I $D(^TMP("C0C-VLAB",$J,1,C0CDA)) Q  ; Already checked during scan of file #63
+	. I $P($G(^AUPNVLAB(C0CDA,11)),"^",8)=1 Q  ; Source is LAB DATA file - skip
 	. D VCHK1
 	;
@@ -76,5 +77,5 @@
 	S (C0CTEST,C0CTEST(64),C0CPTEST,C0CPTEST(64),C0CLN)=""
 	;
-	; ^AUPNVLAB("ALR1",5380,3080307.211055,"EKT 0307 48",188,5427202)=""
+	; ^AUPNVLAB("ALR1",5380,"EKT 0307 48",173,3080307.211055,5427197)=""
 	;
 	S C0C60=""
@@ -82,4 +83,5 @@
 	. D FINDDT
 	. I C0CDA<1 Q
+	. I $P($G(^AUPNVLAB(C0CDA,11)),"^",8)'=1 Q  ; Source is not LAB DATA file - skip
 	. S C0CLN=$P($G(^AUPNVLAB(C0CDA,11)),"^",13)
 	. S C0CPDA=$P($G(^AUPNVLAB(C0CDA,12)),"^",8)
@@ -125,5 +127,5 @@
 	N C0CVLAB,I
 	;
-	F I=0,12 S C0CVLAB(I)=^AUPNVLAB(C0CDA,I)
+	F I=0,12 S C0CVLAB(I)=$G(^AUPNVLAB(C0CDA,I))
 	;
 	; JMC 04/13/09 - Store anything for now that meets date criteria.
