Merge lp:~jontai/openvista-gtm-integration/bug380753 into lp:openvista-gtm-integration

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

Now that bug 381113 has merged, you probably want to look at http://bazaar.launchpad.net/~jontai/openvista-gtm-integration/bug380753/revision/52 to see the changes that this branch effectively makes to mainline.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'mumps/ZISFGTM.m'
2--- mumps/ZISFGTM.m 1970-01-01 00:00:00 +0000
3+++ mumps/ZISFGTM.m 2009-05-29 19:00:44 +0000
4@@ -0,0 +1,62 @@
5+%ZISF ;SFISC/AC MSC/JKT - HOST FILES FOR GT.M on Unix/VMS ;27MAY2009
6+ ;;8.0;KERNEL;**275**;Jul 10, 1995
7+HFS ;Host File Server
8+ Q:$D(IOP)&$D(%IS("HFSIO"))&$D(%IS("IOPAR"))
9+ I $D(%ZIS("HFSNAME")) S IO=%ZIS("HFSNAME"),%X=IO ;
10+ E D ASKHFS
11+ S:$D(%ZISOPAR) %ZISOPAR=$$MODE(%ZISOPAR) ;Force conversion to long format, e.g., (NEWVERSION:NOREADONLY:VARIABLE)
12+H S:$D(%ZIS("HFSMODE")) %ZISOPAR=$$MODE(%ZIS("HFSMODE"))
13+H1 I $D(IO("Q"))!(%IS["Z") S IO("HFSIO")=""
14+ S IO=$S(%X]"":%X,1:IO),IO=$$CHKNM(IO) ;See that we have a directory
15+ S:$D(IO("HFSIO")) IO("HFSIO")=IO
16+ W:'$D(IOP)&$D(%ZIS("HFSNAME")) " HOST FILE TO USE: "_%ZIS("HFSNAME"),!
17+ D ASKPAR^%ZIS6,SETPAR^%ZIS3
18+HFSIOO I '$D(IOP),%ZTYPE="HFS",'$D(%ZIS("HFSMODE")),'$P(^%ZIS(1,%E,0),"^",4),%ZISOPAR="",$D(^%ZIS(1,%E,1)),$P(^(1),"^",6) W ?45,"INPUT/OUTPUT OPERATION: R//"
19+ Q:'$T D SBR^%ZIS1 I $D(DTOUT)!$D(DFOUT)!$D(DUOUT) S POP=1 Q
20+ D HOPT:%X="?"!'$$CHECK(%X),HOPT1:%X="??" G HFSIOO:%X="?"!'$$CHECK(%X)
21+ S:%X]"" %ZISOPAR="("""_%X_""")" Q
22+ ;
23+CHECK(X) ;Check that we have valid option
24+ Q $L(X)=1&("ANRW"[X)
25+ ;
26+ASKHFS ;---Ask host file name here---
27+ I $D(%IS("B","HFS"))#2,%IS("B","HFS")]"" D
28+ .S IO=%IS("B","HFS") ;Set default host file name
29+ S %X='$P($G(^%ZIS(1,%E,1)),"^",5)
30+ S:'%X %X=""
31+ I $D(IOP)!%X!$D(%ZIS("HFSNAME")) S %X="" Q
32+ASKAGN W !,"HOST FILE NAME: "_IO_"//" D SBR^%ZIS1
33+ I %X?1."?".E W !,"ENTER HOST FILE NAME" G ASKAGN
34+ S:$D(DTOUT)!$D(DUOUT) POP=1
35+ Q
36+CHKNM(H) ;Check the HFS name
37+ N N S N=H
38+ I $ZV["VMS" D
39+ . I (H'[":")&(H'["[") S N=$$DEFDIR^%ZISH("")_H
40+ E D
41+ . I (H'["/") S N=$$DEFDIR^%ZISH("")_H
42+ Q N
43+ ;
44+MODE(X) ;Return %ZISOPAR
45+ Q:$E(X)="(" X ;Already in long format
46+ ;
47+ ;Strip out invalid codes
48+ N % F %=1:1:$L(X) I "ANRW"'[$E(X,%) S $E(X,%)=" "
49+ S X=$TR(X," ")
50+ ;
51+ ;Reduce redundant multi-letter combinations to single-letter codes
52+ I X["N"&(X["W") S X=$TR(X,"W")
53+ I X["A"&(X["W") S X=$TR(X,"W")
54+ ;
55+ ;Take the last code in the string, e.g., if X="AN", the "N" will take effect
56+ S X=$E(X,$L(X))
57+ ;
58+ ;Translate code into long format
59+ Q $S(X="N":"(NEWVERSION:NOREADONLY:VARIABLE)",X="W":"(NEWVERSION:NOREADONLY:VARIABLE)",X="A":"(APPEND:NOREADONLY:VARIABLE)",1:"(READONLY:VARIABLE)")
60+ ;
61+HOPT W !,"You may enter a code that represents one of",!,"the following host file input/ouput operation:"
62+ W !?16,"R = READ ACCESS",!?16,"W = WRITE ACCESS",!?16,"N = NEWVERSION",!?16,"A = APPEND"
63+ Q
64+HOPT1 S %ZISI=$O(^DIC(9.2,"B","XUHFSPARAM-GUX",0)) Q:'%ZISI Q:'$D(^DIC(9.2,+%ZISI,0)) Q:$P(^(0),"^",1)'="XUHFSPARAM-GUX"
65+ Q:$D(^DIC(9.2,+%ZISI,1))'>9 F %X=0:0 S %X=$O(^DIC(9.2,+%ZISI,1,%X)) Q:%X'>0 I $D(^(%X,0)) W !,^(0)
66+ W ! S %X="??" Q
67
68=== removed file 'mumps/ZISFGUX.m'
69--- mumps/ZISFGUX.m 2009-05-01 21:05:23 +0000
70+++ mumps/ZISFGUX.m 1970-01-01 00:00:00 +0000
71@@ -1,51 +0,0 @@
72-%ZISF ;SFISC/AC MSC/JDS- HOST FILES FOR GT.M on Unix ;29 Jul 2002 4:10 pm
73- ;;8.0;KERNEL;MSC;Jul 10, 1995;**GT.M PORT**
74-HFS ;Host File Server
75- Q:$D(IOP)&$D(%IS("HFSIO"))&$D(%IS("IOPAR"))
76- I $D(%ZIS("HFSNAME")) S IO=%ZIS("HFSNAME"),%X=IO ;
77- E D ASKHFS
78-H S:$D(%ZIS("HFSMODE")) %ZISOPAR=$$MODE(%ZIS("HFSMODE"))
79-H1 I $D(IO("Q"))!(%IS["Z") S IO("HFSIO")=""
80- S IO=$S(%X]"":%X,1:IO),IO=$$CHKNM(IO) ;See that we have a directory
81- S:$D(IO("HFSIO")) IO("HFSIO")=IO
82- W:'$D(IOP)&$D(%ZIS("HFSNAME")) " HOST FILE TO USE: "_%ZIS("HFSNAME"),!
83- D ASKPAR^%ZIS6,SETPAR^%ZIS3
84-HFSIOO I '$D(IOP),%ZTYPE="HFS",'$D(%ZIS("HFSMODE")),'$P(^%ZIS(1,%E,0),"^",4),%ZISOPAR="",$D(^%ZIS(1,%E,1)),$P(^(1),"^",6) W ?45,"INPUT/OUTPUT OPERATION: R//"
85- Q:'$T D SBR^%ZIS1 I $D(DTOUT)!$D(DFOUT)!$D(DUOUT) S POP=1 Q
86- D HOPT:%X="?"!'$$CHECK(%X),HOPT1:%X="??" G HFSIOO:%X="?"!'$$CHECK(%X)
87- S:%X]"" %ZISOPAR="("""_%X_""")" Q
88- ;
89-CHECK(X) ;Check that we have valid option
90- N Y,%
91- Q:(X["R")&(X["W") 0 ;Can't have both
92- S Y=1 F %=1:1:$L(X) I "AFNRSVW"'[$E(X) S Y=0
93- Q Y
94- ;
95-ASKHFS ;---Ask host file name here---
96- I $D(%IS("B","HFS"))#2,%IS("B","HFS")]"" D
97- .S IO=%IS("B","HFS") ;Set default host file name
98- S %X='$P($G(^%ZIS(1,%E,1)),"^",5)
99- S:'%X %X=""
100- I $D(IOP)!%X!$D(%ZIS("HFSNAME")) S %X="" Q
101-ASKAGN W !,"HOST FILE NAME: "_IO_"//" D SBR^%ZIS1
102- I %X?1."?".E W !,"ENTER HOST FILE NAME" G ASKAGN
103- S:$D(DTOUT)!$D(DUOUT) POP=1
104- Q
105-CHKNM(H) ;Check the HFS name
106- N N S N=H
107- ;I (H'["/")&(H'[":") S N=$$DEFDIR^%ZISH("")_H
108- I (H'["/") S N=$$DEFDIR^%ZISH("")_H
109- Q N
110- ;
111-MODE(X) ;Return %ZISOPAR in Y.
112- N Y,Q S Q=$C(34)
113- S Y=$S(X["R"&(X["W"):"(VARIABLE)",X="N":"(NEWVERSION:NOREADONLY:VARIABLE)",X="W":"(NEWVERSION:NOREADONLY:VARIABLE)",X="A":"(APPEND:NOREADONLY:VARIABLE)",1:"(READONLY:VARIABLE)")
114- Q Y
115- ;
116-HOPT W !,"You may enter a string of codes that represents",!,"the following host file input/ouput operation:"
117- W !?16,"R = READ ACCESS",!?16,"W = WRITE ACCESS",!?16,"N = NEWVERSION",!?16,"S = FIXED FORMAT",!?16,"V = VARIABLE FORMAT",!?16,"A = APPEND"
118- W !,"Example valid groupings 'RV', 'NW', 'AWV'"
119- Q
120-HOPT1 S %ZISI=$O(^DIC(9.2,"B","XUHFSPARAM-GUX",0)) Q:'%ZISI Q:'$D(^DIC(9.2,+%ZISI,0)) Q:$P(^(0),"^",1)'="XUHFSPARAM-GUX"
121- Q:$D(^DIC(9.2,+%ZISI,1))'>9 F %X=0:0 S %X=$O(^DIC(9.2,+%ZISI,1,%X)) Q:%X'>0 I $D(^(%X,0)) W !,^(0)
122- W ! S %X="??" Q
123
124=== modified file 'mumps/ZTMGRSET.m'
125--- mumps/ZTMGRSET.m 2009-05-02 00:47:38 +0000
126+++ mumps/ZTMGRSET.m 2009-05-27 23:01:54 +0000
127@@ -1,4 +1,4 @@
128-ZTMGRSET ;SF/RWF,PUG/TOAD,MSC/JDA/JDS - SET UP THE MGR ACCOUNT FOR THE SYSTEM ;4/2/05 13:08
129+ZTMGRSET ;SF/RWF,PUG/TOAD,MSC/JDA/JDS/JKT - SET UP THE MGR ACCOUNT FOR THE SYSTEM ;27MAY2009
130 ;;8.0;KERNEL;**34,36,69,94,121,127,136,191,275,MSC**;JUL 10, 1995;
131 ;
132 N %D,%S,I,OSMAX,U,X,X1,X2,Y,Z1,Z2,ZTOS,ZTMODE,SCR
133@@ -136,7 +136,7 @@
134 D MOVE,ZOSF("ZOSFGTM")
135 Q
136 8 ;;GT.M (Unix)
137- S %S="ZOSVGUX^ZBBKCGUZ^ZIS4GTM^ZISFGUX^ZISHGUX^XUCIGTM^ZISETUP" ;ZISETGUX^ZTBKCGUX
138+ S %S="ZOSVGUX^ZBBKCGUZ^ZIS4GTM^ZISFGTM^ZISHGUX^XUCIGTM^ZISETUP" ;ZISETGUX^ZTBKCGUX
139 D DES,MOVE
140 S %S="ZOSV2GTM^ZISTCPS",%D="%ZOSV2^%ZISTCPS"
141 D MOVE,ZOSF("ZOSFGUX")

Subscribers

People subscribed via source and target branches