From eddf28943c3b6a7fef2c4aa0981aaa95d3f8be8d Mon Sep 17 00:00:00 2001 From: Sam Habiel Date: Mon, 29 Jul 2019 11:27:14 -0400 Subject: [PATCH] Add Patch 10003 on 2nd line (no new code). No new code. --- Packages/Toolkit/Routines/XINDEX.m | 8 ++++---- Packages/Toolkit/Routines/XINDX10.m | 8 ++++---- Packages/Toolkit/Routines/XINDX9.m | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Packages/Toolkit/Routines/XINDEX.m b/Packages/Toolkit/Routines/XINDEX.m index 6edc82c..3be0810 100644 --- a/Packages/Toolkit/Routines/XINDEX.m +++ b/Packages/Toolkit/Routines/XINDEX.m @@ -1,6 +1,6 @@ -XINDEX ;ISC/REL,GFT,GRK,RWF - INDEX & CROSS-REFERENCE ;MAY 30 2018 - ;;7.3;TOOLKIT;**20,27,48,61,66,68,110,121,128,132,133,10001**;Apr 25, 1995;Build 15 - ; Per VHA Directive 2004-038, this routine should not be modified. +XINDEX ;ISC/REL,GFT,GRK,RWF - INDEX & CROSS-REFERENCE ; 7/29/19 11:20am + ;;7.3;TOOLKIT;**20,27,48,61,66,68,110,121,128,132,133,10003**;Apr 25, 1995;Build 15 + ; BEG+1 modified in *10003* to accomodate 8-16 char routines by Sam Habiel 2019 G ^XINDX6 SEP F I=1:1 S CH=$E(LIN,I) D QUOTE:CH=Q Q:" "[CH S ARG=$E(LIN,1,I-1) S:CH=" " I=I+1 S LIN=$E(LIN,I,999) Q @@ -19,7 +19,7 @@ I $D(^UTILITY($J,1,RTN,0,0)) S ^UTILITY($J,1,RTN,"RSUM")="B"_$$SUMB^XPDRSUM($NA(^UTILITY($J,1,RTN,0))) Q BEG ; - S %=INDLC*5 W:$X+10+%>IOM ! W RTN,$J("",16+%-$L(RTN)) + S %=INDLC*5 W:$X+10+%>IOM ! W RTN,$J("",16+%-$L(RTN)) ; *10003* S (IND("DO"),IND("SZT"),IND("SZC"),LABO)=0,LC=$G(^UTILITY($J,1,RTN,0,0)) I LC="" W !,">>>Routine '",RTN,"' not found <<<",! Q S TXT="",LAB=$P(^UTILITY($J,1,RTN,0,1,0)," ") I RTN'=$P(LAB,"(") D E^XINDX1(17) diff --git a/Packages/Toolkit/Routines/XINDX10.m b/Packages/Toolkit/Routines/XINDX10.m index 32e3c2a..e2ad6db 100644 --- a/Packages/Toolkit/Routines/XINDX10.m +++ b/Packages/Toolkit/Routines/XINDX10.m @@ -1,9 +1,9 @@ -XINDX10 ;ISC/GRK,KRM/CJE,OSE/SMH - assemble DD executable code ;2018-03-13 10:37 AM - ;;7.3;TOOLKIT;**20,27,66,68,132,10001**;Apr 25, 1995;Build 13 +XINDX10 ;ISC/GRK,KRM/CJE,OSE/SMH - assemble DD executable code ; 7/29/19 11:18am + ;;7.3;TOOLKIT;**20,27,66,68,132,10001,10003**;Apr 25, 1995;Build 13 ; Original routine authored by U.S. Department of Veterans Affairs ; Entry points ASKNS,ASKFILES,N1,F1,NS,FILE,INDX & ; Lines START+1,STRIP+14-16 authored by Christopher Edwards 2017. - ; Lines STRIP+16ff, tags ROUTAG,DATA1,AGAIN by Sam Habiel for XINDEXING data 2018. + ; Lines STRIP+16ff, tags ROUTAG,DATA1,AGAIN by Sam Habiel for XINDEXING data 2018-2019. ASK ;Ask for Build, Install, or Package file. N X,Y,P,V,RN S DA=0,Y=-1,INP(11)="" @@ -113,7 +113,7 @@ S INP(10)="NAMESPACE",DA=1 S INDEL="" F S INDEL=$O(^DD(INDFN,INDF,"V",INDEL)) Q:INDEL="" I $D(^(INDEL,1))#2 S INDC=INDF_"VPSCR"_INDEL_" ; VARIABLE POINTER SCREEN",INDX=^(1) D ADD ; ; Modifications to XINDEX data *10001* OSE/SMH - I A["K"!($P(^DD(IDFN,INDF,0),"^",5,999)["^DIM") D DATA1(INDFN,INDF) ; OSE/SMH;WV/DJW - M code in Data + I A["K"!($P(^DD(IDFN,INDF,0),"^",5,999)["^DIM") D DATA1(INDFN,INDF) ; OSE/SMH;WV/DJW - M code in Data ; *10003* M CODE if has ^DIM in input transform I $P(^DD(INDFN,INDF,0),U)["ROUTINE" D ROUTAG ; OSE/SMH - Routine and tag stored separately ; Q diff --git a/Packages/Toolkit/Routines/XINDX9.m b/Packages/Toolkit/Routines/XINDX9.m index 009e084..d9660d8 100644 --- a/Packages/Toolkit/Routines/XINDX9.m +++ b/Packages/Toolkit/Routines/XINDX9.m @@ -1,7 +1,7 @@ -XINDX9 ;SF/RWF - XINDEX SYNTAX CHECKER ;2018-08-03 11:21 AM - ;;7.3;TOOLKIT;**20,27,48,61,66,68,110,121,132,133,10001**;Apr 25, 1995;Build 4 +XINDX9 ;SF/RWF - XINDEX SYNTAX CHECKER ; 7/29/19 11:21am + ;;7.3;TOOLKIT;**20,27,48,61,66,68,110,121,132,133,10001,10003**;Apr 25, 1995;Build 4 ; Original routine authored by Department of Veterans Affairs - ; Modifications in *10001* made by Sam Habiel: GVAR+2,OBJ+2,VAR1+7 in 2018 + ; Modifications in *10001* made by Sam Habiel: GVAR+2,OBJ+2,VAR1+7 in 2018-2019 N CH1,CHO,EC,OP D PARSE S LI=0,AC=255 F %=0:0 S %=$O(LV(%)) Q:%'>0 S LI(%)=0 Q @@ -69,8 +69,8 @@ S LI(LV)=LI,LV=LV-1,LI=LI(LV) ; GVAR() ;EF get var N % D VAR S %=$E(STR,LL,I),LL=I+1 - I %["$$" Q % - E Q $$CASE(%) + I %["$$" Q % ; *10003* - Don't uppercase extrinsic calls. + E Q $$CASE(%) ; *10003* ; OBJ ;check Cache Object S J=$E(STR,I,I+7),J=$$CASE(J) I J'="##CLASS(" D E^XINDX1(3) Q