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

[Jon Tai]

[jeff.apple (jeff-apple)]

I'm not sure why the NOZERO=1 argument is needed when called by FileMan internals but not needed elsewhere.

review: Approve

[Jon Tai (jontai)]

I'm not sure either, but the change is backwards compatible, so it shouldn't really do any harm... it does require a change in FM to be useful though, so I think I'm going to hold off on merging this until George weighs in.

review: Needs Information

[JSHER (joel-sher)]

%ZOSV2 is also called from ^%ZOSF("SAVE") there the array being sent ends in a zero subscript. Calling from the "ZS" in MUMPS OPERATING SYSTEM the saving array does not have an ending zero subscript.

[lp:~jontai/openvista-gtm-integration/bug446644]

104. By Jon Tai on 2009-11-25

merge mainline

105. By Jon Tai on 2009-12-01

revised version from Joel:

George wanted this done differently.
Have the "ZS" Node call ^%ZOSV("SAVE") and have SAVE^ZOSV2 maintain a single parameter and determine if the array has an ending zero subscript.

^DD("OS",19,"ZS")
N DIE,XCN S XCN=0,DIE="^UTILITY($J,0," X ^%ZOSF("SAVE")

^%ZOSF("SAVE")
D SAVE^%ZOSV2(X)

[Jon Tai (jontai)]

OK, I've tested this by installing a KIDS build and by saving a routine with VPE (bug #440789). The KIDS build installation still works, and the VPE bug no longer occurs. Since the general approach has George's approval, and the one issue I had with the %S variable is not really an issue, I'm going to merge this.

review: Approve

[JSHER (joel-sher)]

review: Approve

=== modified file 'mumps/ZOSV2GTM.m'
--- mumps/ZOSV2GTM.m	2009-06-05 20:09:12 +0000
+++ mumps/ZOSV2GTM.m	2009-12-01 23:23:09 +0000
@@ -1,14 +1,15 @@
-%ZOSV2 ;ISF/RWF MSC/JDS - More GT.M support routines ;24APR2009
+%ZOSV2 ;ISF/RWF MSC/JDS - More GT.M support routines ;1DEC2009
  ;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
  Q
  ;SAVE: DIE open array reference.
  ;      XCN is the starting value to $O from.
 SAVE(RN) ;Save a routine
- N %,%F,%I,%N,SP,$ETRAP
+ N %,%F,%I,%N,SP,$ETRAP,%S
  S $ETRAP="S $ECODE="""" Q"
  S %I=$I,SP=" ",%F=$$RTNDIR^%ZOSV()_RN_".m"
  O %F:(newversion:noreadonly:blocksize=2048:recordsize=2044) U %F
- F  S XCN=$O(@(DIE_XCN_")")) Q:XCN'>0  S %=@(DIE_XCN_",0)") Q:$E(%,1)="$"  I $E(%)'=";" W $P(%,SP)_$C(9)_$P(%,SP,2,99999),!
+ N Q,ZS,I S Q=+$G(XCN) F I=0,1 S Q=$O(@(DIE_Q_")")) Q:Q=""  S Q=DIE_Q_")",Q=$Q(@Q)  Q:Q'["0)"  S Q=$O(@(DIE_$QS(Q,$L(DIE,",")+1)_")")) Q:Q=""  S:I ZS=1
+ F  S XCN=$O(@(DIE_+$G(XCN)_")")) Q:XCN'>0  S %=@(DIE_XCN_$S($G(ZS):",0",1:"")_")") Q:$E(%,1)="$"  I $E(%)'=";" W $P(%,SP)_$C(9)_$P(%,SP,2,99999),!
  C %F ;S %N=$$NULL
  ;C %N
  U %I