=================================================================== RCS file: /home/cvs/OpenXM/src/Macaulay2/m2/oxclient.m2,v retrieving revision 1.2 retrieving revision 1.5 diff -u -p -r1.2 -r1.5 --- OpenXM/src/Macaulay2/m2/oxclient.m2 2000/12/14 05:09:29 1.2 +++ OpenXM/src/Macaulay2/m2/oxclient.m2 2006/10/27 01:38:17 1.5 @@ -1,4 +1,4 @@ -ID=" $OpenXM: OpenXM/src/Macaulay2/m2/oxclient.m2,v 1.1 2000/09/21 09:20:53 takayama Exp $ " +ID=" $OpenXM: OpenXM/src/Macaulay2/m2/oxclient.m2,v 1.4 2000/12/17 08:31:39 takayama Exp $ " load "oxcommon.m2" @@ -208,7 +208,7 @@ oxPrimDecomp = method() oxPrimDecomp(OXSESSION, Ideal) := (F, I) -> ( -- translate to asir notation s := toString I; - s = "[" | substring(s,6,#s-7) | "]"; + s = "[" | substring(s,7,#s-8) | "]"; v = toString gens ring I; v = "[" | substring(v,1,#v-2) | "]"; s = "primadec(" | s | "," | v | ");"; @@ -221,7 +221,7 @@ oxPrimDecomp(OXSESSION, Ideal) := (F, I) -> ( oxPrimDecomp(OXSESSION, Ideal) := (F, I) -> ( -- translate to asir notation s := toString I; - s = "[" | substring(s,6,#s-7) | "]"; + s = "[" | substring(s,7,#s-8) | "]"; v = toString gens ring I; v = "[" | substring(v,1,#v-2) | "]"; s = "primadec(" | s | "," | v | ");"; @@ -241,18 +241,20 @@ oxPrimDecomp(OXSESSION, Ideal) := (F, I) -> ( makeLaunchCommand=(UseSSH,MyHostName,RemoteLoginName,RemoteHostName,OxServerName,dPort,cPort,PASS)->( commXterm := toString " xterm -geometry 80x25-0-0 " ; - commOX :=toString " -e ox -ox " | OxServerName | + commOX :=toString " -e ox -ox " | + getenv("OpenXM_HOME") | "/bin/" | + OxServerName | " -data " | dPort | " -control " | cPort | " -reverse " | " -host " | RemoteHostName | " -pass " | PASS | " "; if (UseSSH) then ( - comm = toString "ssh -f -l " | RemoteLoginName | " " | + comm = toString "ssh -f -X -A -l " | RemoteLoginName | " " | RemoteHostName | " '" | commXterm | --uncomment when X11 forwarding is not allowed. - " -display " | MyHostName | ":0 " | + -- " -display " | MyHostName | ":0 " | commOX | "' >/dev/null "; ) else (