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

[Jon Tai]

[Jon Tai (jontai)]

I've tested this lightly on GT.M. Jeff, could you do a quick code review? If you have no objections, I'll merge it.

[jeff.apple (jeff-apple)]

I'll admit I don't fully understand the details of the implementation. I don't see any obvious problems, however. If it unit tests OK, then it's probably just fine. How many test cases could there be?

review: Approve

[Jon Tai (jontai)]

> I'll admit I don't fully understand the details of the implementation. I don't
> see any obvious problems, however. If it unit tests OK, then it's probably
> just fine. How many test cases could there be?

I just flipped back and forth between two instances.

The only thing that concerns me about the patch is line 17 where he's doing some path manipulation manually. I want to keep all the path manipulation in ZCD so that we only have 1 routine to change when we go to fix #336166.

I guess I should ask him about it before I merge. Now that I look closer, it seems like he can call NEWZGZRO^CD(Y(0)) instead.

[JSHER (joel-sher)]

I agree Jon. Lets make the change to call ZCD for the path.

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

105. By Jon Tai on 2009-12-01

call ZCD to get path to .gld file instead of doing the path manipulation ourselves

106. By Jon Tai on 2009-12-01

remove debugging statements

[Jon Tai (jontai)]

OK I've made the changes and re-tested. Can I get one final ACK before I merge?

[JSHER (joel-sher)]

For next time we might want to combine this into one line in ZCD.

  . Q:%ROUTINE="GTM$DMOD"
  . Q:%ROUTINE="ZCD"
+ . I "^MSCXUS3A^XQ1^XUP^%MSCXUCI^%ZMSCXUCI^"[("^"_%ROUTINE_"^") Q ;switch UCI option

review: Approve

=== modified file 'mumps/MSCXUS3A.m'
--- mumps/MSCXUS3A.m	2009-06-05 20:09:12 +0000
+++ mumps/MSCXUS3A.m	2009-12-01 19:06:10 +0000
@@ -1,4 +1,4 @@
-MSCXUS3A ;SF-ISC/STAFF MSC/JDS - CHANGE UCI'S ;30APR2009
+MSCXUS3A ;SF-ISC/STAFF MSC/JDS,JKT - CHANGE UCI'S ;1DEC2009
  ;;8.0;KERNEL;**13,282,MSC**;Jul 10, 1995
  Q
  ;PICK A UCI TO SWITCH TO
@@ -13,14 +13,19 @@
  D ^DIR K DIR I $D(DUOUT)!$D(DTOUT)!(U[X) Q
 SAME I X="" Q  ;Didn't select anythIng.
  ;D PM
- S (X,%UCI)=Y(0) X ^%ZOSF("UCICHECK") I 0[Y G BAD
+ S (MSCX,X,%UCI)=Y(0) X ^%ZOSF("UCICHECK") I 0[Y G BAD
+ I ^%ZOSF("OS")["GT.M" D
+ . N %ZG,%ZRO
+ . D NEWZGZRO^ZCD(Y(0))
+ . S (X,%UCI)=%ZG
  K XQY0 S Y=$O(^[%UCI]VA(200,"B",USERNAME,0))
  I Y S DIR=$P($G(^[%UCI]VA(200,Y,201)),U)
- I DIR,$P($G(^[%UCI]DIC(19,DIR,0)),U,4)="M" S DUZ=Y,XQY=DIR,(DEF,PGM)="%MSCXUCI" G NXT
+ I DIR,$P($G(^[%UCI]DIC(19,DIR,0)),U,4)="M" S DUZ=Y,XQY=DIR,(DEF,PGM)="M^XQ" G NXT
 BAD W !,"UCI not found!" D SHOW G UCI
  ;
 NXT ;Here we go.
  D C^XUSCLEAN K ^XUTL("XQ",$J),^XUTL($J),^TMP($J),^UTILITY($J)
+ I $G(^%ZOSF("OS"))["GT.M" S A=$$SWITCH^ZCD(MSCX) K ^XUTL("XQ",$J),^UTILITY($J) S ^XUTL("XQ",$J,"T")=0,^("XQM")=XQY,XQTT=0 G @(PGM) Q
  K DA G GO^%MSCXUCI
  ;
  ;
@@ -41,19 +46,19 @@
  ;
 NSP(USERNAME) ;LIST OTHER NAMESPACES WHERE THIS USER IS
  N X,L,I,Y
- X ^%ZOSF("UCI") S Y=$P(Y,",") I ^%ZOSF("OS")["GT.M" G GTMNSP
- f I=1:1:$zu(90,0) s L($zu(90,2,0,I))="" ;***CACHE-SPECIFIC   FROM %NSP
+ X ^%ZOSF("UCI") S Y=$P(Y,",") I ^%ZOSF("OS")["GT.M" Q $$GTMNSP
+ X "F I=1:1:$zu(90,0) s L($zu(90,2,0,I))=""""" ;***CACHE-SPECIFIC   FROM %NSP
  S (I,L,X)="" F  S I=$O(L(I)) Q:I=""  I I'=Y D  ;NOT THE CURRENT ONE
  .N DUZ S DUZ=$O(^[I]VA(200,"B",USERNAME,0)) Q:'DUZ
  .I $P($G(^[I]VA(200,DUZ,0)),U,3)=""!'$G(^(201)) Q  ;THEY MUST HAVE ACCESS CODE AND PRIMARY MENU OPTION OVER THERE
  .S L=L+1,X=X_L_":"_I_";"
  Q X
-GTMNSP	;
- N CURRENT S CURRENT=Y
- D LIST^ZCD()
+GTMNSP()	;
+ N CURRENT S CURRENT=Y N Y
+ D LIST^ZCD
  S (I,L,X)="" F  S I=$O(Y(I)) Q:'I  S A=Y(I) I A'=CURRENT D  ;NOT THE CURRENT ONE
  .S A=$P($ZG,"/"_$$CURRENT^ZCD_"/")_"/"_A_"/"_$P($ZG,"/"_$$CURRENT^ZCD_"/",2)
  .N DUZ S DUZ=$O(^[A]VA(200,"B",USERNAME,0)) Q:'DUZ
  .I $P($G(^[A]VA(200,DUZ,0)),U,3)=""!'$G(^(201)) Q  ;THEY MUST HAVE ACCESS CODE AND PRIMARY MENU OPTION OVER THERE
- .S L=L+1,X=X_L_":"_A_";"
+ .S L=L+1,X=X_L_":"_Y(I)_";"
  Q X

=== modified file 'mumps/ZCD.m'
--- mumps/ZCD.m	2009-06-25 23:15:27 +0000
+++ mumps/ZCD.m	2009-12-01 19:06:10 +0000
@@ -1,4 +1,4 @@
-ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 25JUN2009
+ZCD	; MSC/JKT,JDS ; "Namespace" utilities for GT.M/Unix ; 17JUL2009
 	;;8.0;KERNEL;**MSC**;April 21 2009
 	; This routine assumes that your global directory file exists one 
 	; directory below the root of the instance, e.g., 
@@ -71,6 +71,7 @@
 NEXT	F  S %ROUTINE=$VIEW("rtnnext",%ROUTINE) Q:%ROUTINE=""  D
 	. Q:%ROUTINE="GTM$DMOD"
 	. Q:%ROUTINE="ZCD"
+	. I "^MSCXUS3A^XQ1^XUP^%MSCXUCI^%ZMSCXUCI^"[("^"_%ROUTINE_"^") Q  ;switch UCI option
 	. ;
 	. ; The only % routines that we ship start with %Z other % routines are allocated to the 
 	. ; vendor (GTM) and do not need to be recompiled (and may only have object code)