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

[Jon Tai]

[jeff.apple (jeff-apple)]

DEVOPN now returns different results than it did before. However, the new result set looks correct.

review: Approve

=== modified file 'mumps/ZOSVGUX.m'
--- mumps/ZOSVGUX.m	2009-06-02 00:08:14 +0000
+++ mumps/ZOSVGUX.m	2009-06-11 20:20:10 +0000
@@ -1,4 +1,4 @@
-%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;1JUN2009
+%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;11JUN2009
  ;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
  ;
 ACTJ() ; # active jobs
@@ -79,12 +79,10 @@
  Q X
  ;
 JOBPAR ; <=====
- N %FILE S %FILE=$$PWD^%ZISH_"zosv_jobpar_"_$J_".tmp"
- ZSYSTEM "ps c -p "_X_"|tail -1>"_%FILE
- N %I S %I=$I
- O %FILE
- U %FILE R Y U %I
- C %FILE:DELETE
+ ; See if X points to a valid Job. Return its UCI.
+ ; FIXME: currently returns "VAH,ROU" instead of the real UCI (or "" if X is not 
+ ;        the $J of a mumps process)
+ S Y=$$RETURN("ps c -p "_X_" | tail -1")
  F  Q:$E(Y)'=" "  S $E(Y)=""
  I +Y=X,$E(Y,$L(Y)-4,$L(Y))="mumps" S Y="VAH,ROU"
  E  S Y=""
@@ -202,43 +200,32 @@
  ;
 PIDOPN ; give a list of of all JOBS that have the current device open
  ; returns comma separated in Y
- N %FILE S %FILE=$$TEMP_"zosv_pidopn_"_$J_".tmp"
- ZSYSTEM "lsof -F Pc "_$I_" >"_%FILE
- N %I,%X,%Y S %I=$I
- O %FILE
- N %I,%X,%Y S %I=$I
- U %FILE
+ N %PIPE S %PIPE="lsof"
+ O %PIPE:(COMMAND="lsof -F Pc "_$I:READONLY)::"PIPE"
+ N %I,%X,%Y S %I=$I
+ U %PIPE
  F %Y=0:1 R %X Q:%X=""  S %Y(%Y\2,$S($E(%X)="p":"PID",$E(%X)="c":"CMD",1:"?"))=$E(%X,2,$L(%X))
  U %I
- C %FILE:(DELETE)
+ C %PIPE
  S (Y,%X)="" F  S %X=$O(%Y(%X)) Q:%X=""  I %Y(%X,"CMD")="mumps" S Y=Y_","_%Y(%X,"PID")
+ S $E(Y)=""
  Q
  ;
 DEVOPN ;List of Devices opened
  ;Returns variable Y. Y=Devices owned separated by a comma
- ; ZSHOW "D":Y
- N %FILE S %FILE=$$TEMP_"zosv_devopn_"_$J_".tmp"
- ZSYSTEM "lsof -F n -p "_$J_" >"_%FILE
- N %I,%X,%Y S %I=$I
- O %FILE
- U %FILE
- F %Y=0:1 R %X Q:%X=""  S %Y($S($E(%X)="p":"PID",$E(%X)="n":%Y,1:"?"))=$E(%X,2,$L(%X))
- U %I
- C %FILE:(DELETE)
- I %Y("PID")'=$J S Y="" Q
- I $D(%Y("?")) S Y="" Q
- K %Y("PID"),%Y("?")
- S (Y,%X)="" F  S %X=$O(%Y(%X)) Q:%X=""  S Y=Y_","_%Y(%X)
+ N %D,%I
+ S Y=""
+ ZSHOW "D":%D
+ S %I="" F  S %I=$O(%D("D",%I)) Q:%I=""  S Y=Y_","_$P(%D("D",%I)," OPEN ")
+ S $E(Y)=""
  Q
  ;
 RETURN(%COMMAND) ; ** Private Entry Point: execute a shell command & return the resulting value **
  ;
  ; %COMMAND is the string value of the Linux command
- N %VALUE S %VALUE="" ; value to return
- N %FILE S %FILE=$$TEMP_"RET"_$J_".txt" ; temporary results file
- ZSYSTEM %COMMAND_" > "_%FILE ; execute command & save result
- O %FILE:(REWIND) U %FILE R:'$ZEOF %VALUE C %FILE:(DELETE) ; fetch value & delete file
- ;
+ N %PIPE,%VALUE
+ S %PIPE="pipe"
+ O %PIPE:(COMMAND=%COMMAND:READONLY)::"PIPE" U %PIPE R %VALUE C %PIPE
  QUIT %VALUE ; return value
  ;
  ;