Changeset 122 for ccr/trunk/p/GPLVITAL.m

Timestamp:

Aug 30, 2008, 3:13:15 PM (16 years ago)

Author:

George Lilly

Message:

XINDEX fixes. almost clean except for long var names and big files

File:

• ccr/trunk/p/GPLVITAL.m (modified) (3 diffs)

ccr/trunk/p/GPLVITAL.m

@@ -39 +39 @@
           N VSORT,VDATES,VCNT ; ARRAY FOR DATE SORTED VITALS INDEX
           D VITDATES(.VDATES) ; PULL OUT THE DATES INTO AN ARRAY
-          I DEBUG ZWR VDATES ;DEBUG
+          ; I DEBUG ZWR VDATES ;DEBUG
           S VCNT=$$SORTDT^CCRUTIL(.VSORT,.VDATES,-1) ; PUT VITALS IN REVERSE
           ; DATE ORDER AND COUNT THEM. VSORT CONTAINS INDIRECT INDEXES ONLY
@@ -175 +175 @@
           . . . D INSINNER^GPLXPATH(VITOUTXML,VITARYTMP)
           ; ZWR ^TMP($J,"VITALS",*)
-          ZWR ^TMP($J,"VITALARYTMP",*) ; SHOW THE RESULTS
+          ; ZWR ^TMP($J,"VITALARYTMP",*) ; SHOW THE RESULTS
           I DEBUG D PARY^GPLXPATH(VITOUTXML)
           N VITTMP,I
@@ -183 +183 @@
           . F I=1:1:VITTMP(0) W VITTMP(I),!
           Q
-          ;
-VITSORT(V1,V2) ; DEPRECATED USE $$RSORTDT^CCRUTIL
-               ; DATE SORT VITALS ARRAY AND RETURN INDEX IN V1 AND COUNT
-               ; AS EXTRINSIC
-               ; BOTH V1 AND V2 ARE PASSED BY REFERENCE
-          N VSRT ; TEMP FOR HASHING DATES
-          N ZI,ZJ,ZTMP,ZCNT,ZP1,ZP2
-          S ZCNT=0 ; COUNTING NUMBER OF VITALS
-          S ZTMP="" ;
-          F ZI=0:0 D  Q:$O(V2(ZTMP))=""  ; FOR EACH VITAL IN THE ARRAY
-          . S ZCNT=ZCNT+1 ; INCREMENT THE COUNT
-          . S ZTMP=$O(V2(ZTMP)) ; NEXT VITAL
-          . I $D(V2(ZTMP)) D  ; IF THE RESULT EXISTS
-          . . S ZP1=$P($P(V2(ZTMP),U,4),".",1) ; THE DATE PIECE
-          . . S ZP2=$P($P(V2(ZTMP),U,4),".",2) ; THE TIME PIECE
-          . . S VSRT(ZP1,ZP2_"00000"_ZCNT)=ZCNT ; HASH ON DATE AND TIME
-          . . ; S VSRT($P(V2(ZTMP),U,4)_"000000"_ZCNT)=ZCNT ; PULL DATE
-          . I DEBUG W "ZTMP=",ZTMP," "
-          S V1(0)=ZCNT ; ARRAYS ARE THE SAME SIZE
-          I DEBUG ZWR V2
-          I DEBUG ZWR VSRT
-          N ZD,ZT ; DATA AND TIME ITERATORS
-          N ZDONE ; DONE FLAG
-          S (ZD,ZT)=""
-          S ZDONE=0
-          N ZZCNT S ZZCNT=0 ; ANOTHER COUNTER
-          F ZI=0:0 D  Q:ZDONE  ; VISIT THE ARRAY IN DATE ORDER
-          . S ZD=$O(VSRT(ZD),-1) ; NEXT DATE
-          . I ZD="" S ZDONE=1
-          . I 'ZDONE D  ; MORE DATES
-          . . S ZT="" ; WANT FIRST TIME FOR THIS DATE
-          . . F ZJ=0:0 D  Q:$O(VSRT(ZD,ZT),-1)=""  ; LOOP THROUGH ALL TIMES
-          . . . S ZT=$O(VSRT(ZD,ZT),-1) ; NEXT TIME
-          . . . S ZZCNT=ZZCNT+1 ; INCREMENT COUNTER
-          . . . S V1(ZZCNT)=VSRT(ZD,ZT) ; PULL OUT THE INDEX
-          . ; S V1(ZI)=ZI ; PLUG FOR NOW, DATES NOT SORTED
-          I DEBUG ZWR V1
-          Q ZCNT
           ;
 VITDATES(VDT) ; VDT IS PASSED BY REFERENCE AND WILL CONTAIN THE ARRAY