Merge lp://staging/~jeff-apple/openvista-gtm-integration/bug333538 into lp://staging/openvista-gtm-integration

Proposed by jeff.apple
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~jeff-apple/openvista-gtm-integration/bug333538
Merge into: lp://staging/openvista-gtm-integration
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~jeff-apple/openvista-gtm-integration/bug333538
Reviewer Review Type Date Requested Status
Jon Tai Approve
Review via email: mp+5777@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
jeff.apple (jeff-apple) wrote :

This change introduces $ZGB into a line called by other platforms. At the very least this will be a compile error there.

Needs header and patch comment updates.

Revision history for this message
Jon Tai (jontai) wrote :

> This change introduces $ZGB into a line called by other platforms. At the very
> least this will be a compile error there.

I don't think so; the following was run on a Cache system:

OPEN>S STR=$S(^%ZOSF("OS")["GT.M":$ZGB,1:"OTHER")

OPEN>W STR
OTHER
OPEN>W $ZGB

W $ZGB
^
<SYNTAX>
OPEN>

So unless ^%ZOSF("OS") is "GT.M", other systems should not attempt to access $ZGB and everything will be fine.

> Needs header and patch comment updates.

Agreed.

Revision history for this message
jeff.apple (jeff-apple) wrote :

Cache Studio marks this as an error with a red underline, but the compile doesn't complain.

Revision history for this message
JSHER (joel-sher) wrote :

The code does not generate an error in Cache. but I am checking further

CCDH>S Y=$$UCICHECK^%ZOSV(Y) I $L(Y)>2 S STR=$P($G(^[$S(^%ZOSF("OS")["GT.M":$ZGB,1:Y)]VA(200,D,0)),",")_": "

CCDH>W STR
SCHLEHUBER:

Revision history for this message
Jon Tai (jontai) wrote :

Let's merge it.

review: Approve
Revision history for this message
Jon Tai (jontai) wrote :

> Let's merge it.

Er... sorry, please add header comments first.

Revision history for this message
Jon Tai (jontai) wrote :

> > Let's merge it.
>
> Er... sorry, please add header comments first.

Argh. I spoke too soon. There's already MSC on the second line - we've touched this routine before.

25. By jeff.apple

take GTM-specific code out of expression

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'mumps/XTER1A.m'
2--- mumps/XTER1A.m 1970-01-01 00:00:00 +0000
3+++ mumps/XTER1A.m 2009-04-22 07:28:21 +0000
4@@ -0,0 +1,106 @@
5+XTER1A ;ISC-SF.SEA/JLI - VA error reporting ;28MAR2006
6+ ;;8.0;KERNEL;**63,112,120,MSC,IHS**;Jul 10, 1995
7+ ;
8+TWO ;
9+ S XTNUM=2
10+ONE ;
11+ S:'$D(XTNUM) XTNUM=1
12+ S:'$D(XTNDATE) XTNDATE=$H-1 I '$D(ZTQUEUED) S XTNDAT1=$$HTFM^XLFDT(XTNDATE),XTNDAT2=XTNDAT1 G INT^XTER1A1
13+ K ^TMP($J,"XTER1A") D LISTN,LIST
14+EXIT K XTNUM,XTNDATE,XTERN,XTERX,X,N,N1,Y,C,XTOUT,Z,I,XTER1AX,XTER1AN,XTER1AN1,%XTZDAT,%XTZNUM,XTMES,XTDV1,XTMES,XTPRNT
15+ Q
16+LISTN ;
17+ F XTERN=0:0 S XTERN=$O(^%ZTER(1,XTNDATE,1,XTERN)) Q:XTERN'>0 I $D(^(XTERN,"ZE")) S XTERX=$E(^("ZE"),1,30),X=^("ZE") D
18+ .S N1=0 F N=0:0 S N=$O(^TMP($J,"XTER1A",XTERX,N)) Q:N="" S N1=N I ^(N)=X Q
19+ .I N="" S ^TMP($J,"XTER1A",XTERX,N1+1)=X,^(N1+1,"CNT")=1,^(1)=XTNDATE_U_XTERN
20+ .E S ^("CNT")=^TMP($J,"XTER1A",XTERX,N,"CNT")+1 I ^("CNT")'>XTNUM S Y=^("CNT"),^(Y)=XTNDATE_U_XTERN
21+ .Q
22+ Q
23+LIST ;
24+ S XTERX="",C=0,XTOUT=0 K ^TMP($J,"XTER")
25+ F S XTERX=$O(^TMP($J,"XTER1A",XTERX)) Q:XTERX="" F N=0:0 S N=$O(^TMP($J,"XTER1A",XTERX,N)) Q:N'>0 D
26+ .S X=^TMP($J,"XTER1A",XTERX,N) S C=C+1,^TMP($J,"XTER",C)="",C=C+1,^(C)="",Z=$J(^TMP($J,"XTER1A",XTERX,N,"CNT"),8)_" "
27+ .F I=1:60 S Y=$E(X,I,I+59) Q:Y="" S C=C+1,^TMP($J,"XTER",C)=Z_Y,Z=" "
28+ S XTER1AX="" F S XTER1AX=$O(^TMP($J,"XTER1A",XTER1AX)) Q:XTER1AX="" F XTER1AN=0:0 S XTER1AN=$O(^TMP($J,"XTER1A",XTER1AX,XTER1AN)) Q:XTER1AN'>0 D
29+ .F XTER1AN1=0:0 S XTER1AN1=$O(^TMP($J,"XTER1A",XTER1AX,XTER1AN,XTER1AN1)) Q:XTER1AN1'>0 S X=^(XTER1AN1) D
30+ ..S C=C+1,^TMP($J,"XTER",C)="|PAGE|" S %XTZDAT=+X,%XTZNUM=$P(X,U,2),XTDV1=0 S XTMES=1 D WRT^XTER1
31+ D:IO=""&$D(^TMP($J,"XTER")) MESSG D:IO'="" WRITER
32+ K ^TMP($J,"XTER") S C=0 I IO'="" U IO D ^%ZISC
33+ Q
34+ ;
35+MESG N DWPK,DWLW,DIC K ^TMP($J,"XTER"),^TMP($J,"XTER1")
36+ W @IOF,!!,"Enter any comments to precede the error listing:"
37+ S DWPK=1,DWLW=75,DIC="^TMP($J,""XTER1""," D EN^DIWE
38+ S C=0 W ! F I=0:0 S I=$O(^TMP($J,"XTER1",I)) Q:I'>0 S C=I,^TMP($J,"XTER",I)=^TMP($J,"XTER1",I,0)
39+ S XTMES=1,XTDV1=0 D WRT^XTER1 D:C>0 MESSG
40+ S C=0 K XTMES,^TMP($J,"XTER"),^TMP($J,"XTER1")
41+ G XTERR^XTER
42+ ;
43+PRNT K ^TMP($J,"XTER"),ZTIO
44+ S C=0,%ZIS="MQ" D ^%ZIS I POP D HOME^%ZIS G WRT^XTER1
45+ I $D(IO("Q")) D S XTX="" G XTERR^XTER
46+ . K IO("Q") S ZTRTN="DQPRNT^XTER1A",ZTSAVE("%XTZDAT")="",ZTSAVE("%XTZNUM")="",ZTDESC="XTER1A-PRINT OF ERROR" D ^%ZTLOAD K ZTSK D HOME^%ZIS
47+ ;
48+DQPRNT S XTPRNT=1,XTOUT=0 D WRT^XTER1 U IO D:C>0 WRITER
49+ K ^TMP($J,"XTER"),XTX,XTPRNT S C=0 D ^%ZISC I $D(ZTQUEUED) Q
50+ G XTERR^XTER
51+ ;
52+WRITER F %=0:0 S %=$O(^TMP($J,"XTER",%)) Q:%'>0 W:((IOSL-$Y)'>4&$G(XTPRNT)) @IOF S %1=$S($D(^(%))=1:^(%),1:^(%,0)) D
53+ .I $E(%1,1,6)="|PAGE|" W @IOF S %1=$E(%1,7,$L(%1)) Q:%1=""
54+ .I $E(%1,1,4)="@IOF" W @IOF S %1=$E(%1,5,$L(%1)) Q:%1=""
55+ .W !,%1
56+ K %,%1
57+ Q
58+MESSG S XMY(DUZ)="",XMDUZ=.5 I '$D(ZTQUEUED) K XMY,XMDUZ
59+ S XMTEXT="^TMP($J,""XTER"",",XMSUB="ERROR - "_$E(%XTZE,1,40) F Q:XMSUB'[U S XMSUB=$P(XMSUB,U)_"~U~"_$P(XMSUB,U,2,99)
60+ D ^XMD K XMY,XMTEXT,XMSUB
61+ Q
62+ ;
63+MORE Q:$G(XTMES) N DIR,DTOUT,DIRUT,DUOUT
64+ S XTOUT=0,XTX="" D WRITER K ^TMP($J,"XTER") S C=0
65+ I '$D(ZTQUEUED),'$G(XTPRNT),$G(IOST)["C-" D
66+ . S:($D(X)#2) XTMORE=X S DIR(0)="FO^0:50",DIR("A")=" Enter '^' to quit listing, <RETURN> to continue..."
67+ . D ^DIR K DIR S:$D(DTOUT) X="^" S XTX=X S:$D(XTMORE) X=XTMORE K XTMORE
68+ I $D(XTX),$E(XTX)="^" S XTOUT=1 Q
69+ I $G(XTPRNT) W @IOF
70+ Q
71+ ;
72+LST S X=" ",XTQ="" N XTXT,XBLNK S $P(XBLNK," ",80)=" "
73+T1 S X=$O(^%ZTER(1,%XTZDAT,1,X),-1) R XTQ:0 Q:XTQ'="" G T2:X'>0,T1:'($D(^(X,"ZE"))#2) S XTP=^("ZE"),XTS=""
74+ F S XTS=$O(^TMP($J,"XTERSCR",XTS)) Q:XTS="" I XTP[XTS,XTD S XTD=XTD+1 G T1
75+ ;
76+ I '(X#20) S %XTERRX=X D MORE Q:XTOUT Q:XTX>0 D T3 S X=%XTERRX
77+ I ^%ZTER(1,%XTZDAT,1,X,"ZE")["," S %XTERR=$P($P(^("ZE"),",",4),"-",4),%XTERR=$P($P(^("ZE"),",",2),"-",3)_$S(%XTERR="":"",1:"(")_%XTERR_$S(%XTERR="":"",1:")") S XTXT=$J(X,3)_") "_"<"_%XTERR_">"_$P(^("ZE"),",",1)_" "
78+ I ^%ZTER(1,%XTZDAT,1,X,"ZE")'["," S XTXT=$J(X,3)_") "_^("ZE")
79+ S %XTZNUM=X,%="" I $D(^%ZTER(1,%XTZDAT,1,%XTZNUM,"H")) S %H=^("H") D YMD^%DTC S %=$P(%,".",2)_"000000",%=$E(%,1,2)_":"_$E(%,3,4)_":"_$E(%,5,6)
80+ S X=%XTZNUM S XTXT=$S($L(XTXT)>34:XTXT,1:$E(XTXT_XBLNK,1,34))_%
81+ I $D(^%ZTER(1,%XTZDAT,1,X,"J")) S XTXT=XTXT_" ["_$P($P(^("J"),U,4),",")_"]" ;_" "_$J($P(^("J"),U,5),7)
82+ D IHSXQY0 ;***IHS
83+ W !,$E(XTXT,1,79)
84+COMMENT I $D(^DD(3.0751,21400)) D ;**MSC/GFT
85+ .N DIC,DIQ,DR,DA,Y,S,DK,D0,D1
86+ .S DIC="^%ZTER(1,"_%XTZDAT_",1,",DIQ(0)="A",DR=21400,DA=X,DA(1)=%XTZDAT
87+ .I $D(@(DIC_DA_",21400)")) N X D EN^DIQ
88+ G T1
89+T2 I XTD W !! I XTD-1 W XTD-1," screened error",$S(XTD-1>1:"s",1:""),!
90+ ;D MORE
91+ Q
92+T3 W !!,?11,"$ZE",?41,"Time",?49,"UCI,VOL",?61,"$J",?69,"$I",!
93+ Q
94+INTRACT ;
95+ G INTRACT^XTER1A1
96+ ;
97+ ;
98+ ;
99+ ;
100+IHSXQY0 ;IHS/ANMC/LJF 5/20/99 find option name
101+ NEW IHS,FOUND,STR
102+ S (FOUND,IHS)=0,STR=""
103+ F S IHS=$O(^%ZTER(1,%XTZDAT,1,X,"ZV",IHS)) Q:'IHS Q:FOUND D
104+ .I $G(^%ZTER(1,%XTZDAT,1,X,"ZV",IHS,0))="DUZ" D Q
105+ ..N D,Y S D=$G(^("D")) I D S Y=$P($G(^%ZTER(1,%XTZDAT,1,X,"J")),U,4),Y=$$UCICHECK^%ZOSV(Y) I $L(Y)>2 S STR=$P($G(^[$S(^%ZOSF("OS")["GT.M":$ZGB,1:Y)]VA(200,D,0)),",")_": "
106+ . Q:$G(^%ZTER(1,%XTZDAT,1,X,"ZV",IHS,0))'="XQY0"
107+ . S STR=STR_$P($G(^%ZTER(1,%XTZDAT,1,X,"ZV",IHS,"D")),U)
108+ . S STR=$E(STR,1,26)_$$REPEAT^XLFSTR(" ",(26-$L(STR))),FOUND=1
109+ S XTXT=XTXT_" "_$G(STR)
110+ Q

Subscribers

People subscribed via source and target branches