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

[Jon Tai]

[JSHER (joel-sher)]

Jon,
would you want to retain

I Y="* D DOLRO Q

Otherwise if Y is "*" there is a syntax error.
CCDH>S Y="*"

CCDH>S X="^JDSY("

CCDH>D ORDER^%ZOSV

 S (Y,Y1)=$P(Y,"*",1) I $D(@Y)=0 F %=0:0 S Y=$O(@Y) Q:Y=""!(Y[Y1)

(This error is true in the current CACHE version also)
                      ^
<SYNTAX>ORDER+1^%ZOSV

review: Needs Information

[Jon Tai (jontai)]

So just to be perfectly clear.. you're suggesting adding the line:

I Y="*" D DOLRO Q

as the first line of ORDER^ZOSVGUX and ORDER^ZOSVONT?

So the ORDER subroutine in both would read:

ORDER ;SAVE PART OF SYMBOL TABLE IN LOCATION SPECIFIED BY X
 I Y="*" D DOLRO Q
 S (Y,Y1)=$P(Y,"*",1) I $D(@Y)=0 F %=0:0 S Y=$O(@Y) Q:Y=""!(Y[Y1)
 Q:Y="" S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
 F %=0:0 S Y=$O(@Y) Q:Y=""!(Y'[Y1) S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
 K %,X,Y,Y1

[JSHER (joel-sher)]

Yes,add the line as you describe.

> So just to be perfectly clear.. you're suggesting adding the line:
>
> I Y="*" D DOLRO Q
>
> as the first line of ORDER^ZOSVGUX and ORDER^ZOSVONT?
>
> So the ORDER subroutine in both would read:
>
> ORDER ;SAVE PART OF SYMBOL TABLE IN LOCATION SPECIFIED BY X
> I Y="*" D DOLRO Q
> S (Y,Y1)=$P(Y,"*",1) I $D(@Y)=0 F %=0:0 S Y=$O(@Y) Q:Y=""!(Y[Y1)
> Q:Y="" S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
> F %=0:0 S Y=$O(@Y) Q:Y=""!(Y'[Y1) S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S
> %X=Y_"(",%Y=X_"Y," D %XY^%RCR
> K %,X,Y,Y1

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

49. By Jon Tai on 2009-06-01

add check for Y="*" at Joel's suggestion

50. By Jon Tai on 2009-06-01

add pristine ZOSVONT

51. By Jon Tai on 2009-06-01

add the same Y="*" check for the Cache version of ZOSV

[Jon Tai (jontai)]

Alright, I've added the line for both Cache and GT.M variants of ZOSV. Did you have any other comments, or should I merge this branch into mainline?

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

52. By Jon Tai on 2009-06-02

sneak in an extra newline on the system user name prompt

=== modified file 'mumps/ZOSVGUX.m'
--- mumps/ZOSVGUX.m	2009-04-15 03:13:40 +0000
+++ mumps/ZOSVGUX.m	2009-05-27 23:12:59 +0000
@@ -1,4 +1,4 @@
-%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA - View commands & special functions. ;09/03/2003  15:34
+%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;27MAY2009
  ;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
  ;
 ACTJ() ; # active jobs
@@ -114,14 +114,11 @@
  . I $D(@Y)>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
  K %X,%Y,Y Q
  ;
-ORDER ;SAVE PARTS OF SYMBOL TABLE IN LOCATION SPECIFIED BY X
- ;PARTS INDICATED BY X1("NAMESPACE*")="" ARRAY
- I $D(X1("*"))#2 D DOLRO Q
- S X1="" F  S X1=$O(X1(X1)) Q:X1=""  D
- . S (Y,Y1)=$P(X1,"*") I $D(@Y)=0 F  S Y=$O(@Y) Q:Y=""!(Y[Y1)
- . Q:Y=""  S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
- . F  S Y=$O(@Y) Q:Y=""!(Y'[Y1)  S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
- K %,%X,%Y,Y,Y1
+ORDER ;SAVE PART OF SYMBOL TABLE IN LOCATION SPECIFIED BY X
+ S (Y,Y1)=$P(Y,"*",1) I $D(@Y)=0 F %=0:0 S Y=$O(@Y) Q:Y=""!(Y[Y1)
+ Q:Y=""  S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
+ F %=0:0 S Y=$O(@Y) Q:Y=""!(Y'[Y1)  S %=$D(@Y) S:%#2 @(X_"Y)="_Y) I %>9 S %X=Y_"(",%Y=X_"Y," D %XY^%RCR
+ K %,X,Y,Y1
  Q
  ;
 PARSIZ ;