Changeset 298 for ccr

Timestamp:

Dec 5, 2008, 3:04:15 PM (16 years ago)

Author:

George Lilly

Message:

fixes to GET and FIELD to handle duplicate field titles

File:

• ccr/trunk/p/C0CDIC.m (modified) (2 diffs)

ccr/trunk/p/C0CDIC.m

@@ -112 +112 @@
  . . S C0CFN=$P(^DD(C0CFJ,C0CFI,0),"^",1) ;PULL FIELD NAME FROM ^DD
  . . ;W "N: ",C0CFN,!
+ . . ;I C0CFN="STR" W C0CFN," ",C0CFJ,!
  . . I $D(@C0CFRTN@(C0CFN)) D  ; IS THIS A DUPLICATE?
  . . . W "DUPLICATE FOUND! ",C0CFJ," ",C0CFI," ",C0CFN,!,@C0CFRTN@(C0CFN),!
- . . . S @C0CFRTN@("M",@C0CFRTN@(C0CFN),C0CFN)=C0CFJ_"^"_C0CFI
+ . . . S @C0CFRTN@(C0CFN_"_"_C0CFJ)=C0CFJ_"^"_C0CFI
  . . E  S @C0CFRTN@(C0CFN)=C0CFJ_"^"_C0CFI
  . S C0CFJ=$O(^DD(C0CFJ)) ; NEXT SUBFILE
  Q
  ;
-GET(GRTN,GFILE,GIEN) ; RETURN THE DICTIONARY RECORD GIEN IN ARRAY GRTN, PASSED
+GET(GRTN,GFILE,GIEN,GNN) ; RETURN THE DICTIONARY RECORD GIEN IN ARRAY GRTN, PASSED
  ; BY NAME
  ;
- N C0CTMP,C0CI,C0CJ,C0CREF,C0CNAME
+ ;N C0CTMP,C0CI,C0CJ,C0CREF,C0CNAME
+ I $D(GNN) I GNN="ALL" S C0CNN=0 ; NOT NON-NULL (ALL FIELDS TO BE RETURNED)
+ E  S C0CNN=1 ; NON-NULL IS TRUE (ONLY POPULATED FIELDS RETURNED)
  S C0CREF=GIEN_"," ; OPEN ROOT REFERENCE INTO FILE
  D GETS^DIQ(GFILE,C0CREF,"**","","C0CTMP")
@@ -132 +135 @@
  . . ;W C0CJ," ",C0CI,!
  . . S C0CNAME=$P(^DD(C0CJ,C0CI,0),"^",1) ;PULL THE FIELD NAME
- . . S $P(@GRTN@(C0CNAME),"^",3)=C0CTMP(C0CJ,C0CREF,C0CI) ;RETURN VALUE IN P3
+ . . S C0CVALUE=C0CTMP(C0CJ,C0CREF,C0CI) ;
+ . . I C0CVALUE["C0CTMP" S C0CVALUE=C0CTMP(C0CJ,C0CREF,C0CI,1) ;1ST LINE OF WP
+ . . S $P(@GRTN@(C0CNAME),"^",3)=C0CVALUE ;RETURN VALUE IN P3
+ I C0CNN D  ; IF ONLY NON-NULL VALUES ARE TO BE RETURNED
+ . S C0CI=""
+ . F  S C0CI=$O(@GRTN@(C0CI)) Q:C0CI=""  D  ; GO THROUGH THE WHOLE ARRAY
+ . . I $P(@GRTN@(C0CI),"^",3)="" K @GRTN@(C0CI) ; KILL THE NULL ENTRIES
  Q
  ;