===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.37
retrieving revision 1.41
diff -u -p -r1.37 -r1.41
--- OpenXM/src/OpenMath/OMproxy.java	2000/06/13 14:04:19	1.37
+++ OpenXM/src/OpenMath/OMproxy.java	2000/10/11 08:32:13	1.41
@@ -1,22 +1,21 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.36 2000/04/17 03:18:57 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.40 2000/09/13 06:44:55 tam Exp $
  */
 
-import JP.ac.kobe_u.math.tam.OpenXM.*;
+import ORG.openxm.tam.*;
 import java.util.Stack;
 import java.io.*;
 
 public class OMproxy extends OpenXMserver{
-  private OpenXM ox;
   private Stack stack = new Stack();
-  protected boolean debug = true;
+  protected boolean debug = false;
   final int version = 200006130;
 
   public OMproxy(String hostname,int ControlPort,int DataPort){
     super(hostname,ControlPort,DataPort);
   }
 
-  public void computeProcess(OpenXMconnection stream){
+  public void computeProcess(OpenXMstream stream){
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
@@ -28,7 +27,7 @@ public class OMproxy extends OpenXMserver{
 
 	  switch(ox_tag){
 	  case OXmessage.OX_COMMAND:
-	    StackMachine((SM)message.getBody());
+	    StackMachine((SM)message.getBody(),stream);
 	    break;
 
 	  case OXmessage.OX_DATA:
@@ -47,36 +46,40 @@ public class OMproxy extends OpenXMserver{
       System.err.println(e.getMessage());
       e.printStackTrace();
       System.err.println("error occured, and recovering processes seems to be impossible.");
+    }catch(Exception e){
+      System.err.println(e.getMessage());
+      e.printStackTrace();
+      System.err.println("error occured, and recovering processes seems to be impossible.");
     }finally{
-      System.out.println("breaking...");
+      System.err.println("breaking...");
     }
   }
 
   /*
   public void stop(){
-    System.out.println("OMproxy Stoping...");
+    System.err.println("OMproxy Stoping...");
     synchronized(ox){
       //this.stop();
       while(!stack.empty()){
 	stack.pop();
       }
-      System.out.println("OMproxy Stopped");
+      System.err.println("OMproxy Stopped");
     }
   }
   */
 
-  private void SM_popCMO() throws java.io.IOException{
+  private void SM_popCMO(OpenXMstream stream) throws java.io.IOException{
     try{
       if(stack.empty()){
-	ox.send(new CMO_NULL());
+	stream.send(new CMO_NULL());
       }else{
 	debug("sending CMO: "+ stack.peek());
-	ox.send((CMO)stack.pop());
+	stream.send((CMO)stack.pop());
 	debug("test");
       }
     }catch(MathcapViolation e){
       try{
-	ox.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+
+	stream.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+
 					      e.getMessage())));
       }catch(MathcapViolation tmp){}
     }
@@ -115,7 +118,7 @@ public class OMproxy extends OpenXMserver{
     return;
   }
 
-  private void SM_mathcap() throws java.io.IOException{
+  private void SM_mathcap(OpenXMstream stream) throws java.io.IOException{
     CMO[] mathcap = new CMO[3];
 
     {
@@ -164,21 +167,23 @@ public class OMproxy extends OpenXMserver{
     debug("push: "+ stack.peek());
   }
 
-  private void SM_setMathCap() throws java.io.IOException{
+  private void SM_setMathCap(OpenXMstream stream)
+       throws java.io.IOException{
     Object mathcap = stack.pop();
 
     if(mathcap instanceof CMO_MATHCAP){
       stack.push(new CMO_ERROR2(new CMO_NULL()));
     }
-    ox.setMathCap((CMO_MATHCAP)mathcap);
+    stream.setMathCap((CMO_MATHCAP)mathcap);
   }
 
-  private void StackMachine(SM mesg) throws java.io.IOException{
+  private void StackMachine(SM mesg,OpenXMstream stream)
+       throws java.io.IOException{
     debug("receive: "+mesg);
 
     switch(mesg.getCode()){
     case SM.SM_popCMO:
-      SM_popCMO();
+      SM_popCMO(stream);
       break;
 
     case SM.SM_executeFunction:
@@ -186,15 +191,15 @@ public class OMproxy extends OpenXMserver{
       break;
 
     case SM.SM_mathcap:
-      SM_mathcap();
+      SM_mathcap(stream);
       break;
 
     case SM.SM_setMathCap:
-      SM_setMathCap();
+      SM_setMathCap(stream);
       break;
 
     default:
-      System.out.println("received "+ mesg);
+      System.err.println("received "+ mesg);
     }
   }
 
@@ -238,9 +243,9 @@ public class OMproxy extends OpenXMserver{
   }
 
   private void debug(String str){
-    //if(debug){
-    System.err.println(str);
-    //}
+    if(debug){
+      System.err.println(str);
+    }
   }
 
   private static String usage(){
@@ -265,7 +270,7 @@ public class OMproxy extends OpenXMserver{
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-        System.out.println("");
+        System.err.println("");
         System.exit(0);
       }else if(argv[i].equals("-host")){
         hostname = argv[++i];
@@ -297,6 +302,6 @@ public class OMproxy extends OpenXMserver{
 
     ox.start();
 
-    System.out.println("breaking...");
+    System.err.println("breaking...");
   }
 }