===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.25
retrieving revision 1.42
diff -u -p -r1.25 -r1.42
--- OpenXM/src/OpenMath/OMproxy.java	2000/01/20 18:55:22	1.25
+++ OpenXM/src/OpenMath/OMproxy.java	2001/01/30 05:55:13	1.42
@@ -1,92 +1,108 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.24 2000/01/20 18:14:32 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.41 2000/10/11 08:32:13 ohara Exp $
  */
 
-import JP.ac.kobe_u.math.tam.OpenXM.*;
+import ORG.openxm.tam.*;
 import java.util.Stack;
 import java.io.*;
 
-class OMproxy implements Runnable{
-  private OpenXM ox;
+public class OMproxy extends OpenXMControlServer{
   private Stack stack = new Stack();
   protected boolean debug = false;
-  final int version = 200001190;
+  final int version = 200006130;
 
-  public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
-    ox = new OpenXM(this,host,ControlPort,DataPort);
+  public OMproxy(String hostname,int ControlPort,int DataPort){
+    super(hostname,ControlPort,DataPort);
   }
 
-  public void run(){
+  public void computeProcess(OpenXMstream stream){
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
-    while(true){
-      try{
-	int ox_tag = ox.receiveOXtag();
+    try{
+      while(true){
+	try{
+	  OXmessage message = stream.receive();
+	  int ox_tag = message.getTag();
 
-	switch(ox_tag){
-	case OpenXM.OX_COMMAND:
-	  StackMachine(ox.receiveSM());
-	  break;
+	  switch(ox_tag){
+	  case OXmessage.OX_COMMAND:
+	    StackMachine((SM)message.getBody(),stream);
+	    break;
 
-	case OpenXM.OX_DATA:
-	  stack.push(ox.receiveCMO());
-	  debug("push: "+ stack.peek());
-	  break;
+	  case OXmessage.OX_DATA:
+	    stack.push(message.getBody());
+	    debug("push: "+ stack.peek());
+	    break;
+	  }
+	}catch(RuntimeException e){
+	  System.err.println(e.getMessage());
+	  e.printStackTrace();
+	  debug("error occured. stack was cleared.");
+	  stack = new Stack();
 	}
-      }catch(Throwable e){
-	System.err.println(e.getMessage());
-	e.printStackTrace();
-	debug("error occured. stack was cleared.");
       }
+    }catch(IOException e){
+      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.err.println("breaking...");
     }
-    //System.out.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(stack.pop());
+	stream.send((CMO)stack.pop());
+	debug("test");
       }
     }catch(MathcapViolation e){
-      stack.push(new CMO_STRING(e.getMessage()));
+      try{
+	stream.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+
+					      e.getMessage())));
+      }catch(MathcapViolation tmp){}
     }
   }
 
   private void SM_executeFunction() throws java.io.IOException{
     String function_name;
     CMO[] argv;
-    int argc = 1;
+    int argc;
 
     if(!(stack.peek() instanceof CMO_STRING)){
-      stack.push(new CMO_ERROR2());
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
     function_name = ((CMO_STRING)stack.pop()).getString();
-    //argc = ((CMO_INT32)stack.pop()).intValue();
+    argc = ((CMO_INT32)stack.pop()).intValue();
     argv = new CMO[argc];
     for(int i=0;i<argc;i++){
       argv[i] = (CMO)stack.pop();
     }
 
     if(argc != 1){
-      stack.push(new CMO_ERROR2());
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
 
@@ -98,11 +114,11 @@ class OMproxy implements Runnable{
       return;
     }
 
-    stack.push(new CMO_ERROR2());
+    stack.push(new CMO_ERROR2(new CMO_NULL()));
     return;
   }
 
-  private void SM_mathcap() throws java.io.IOException{
+  private void SM_mathcap(OpenXMstream stream) throws java.io.IOException{
     CMO[] mathcap = new CMO[3];
 
     {
@@ -124,47 +140,50 @@ class OMproxy implements Runnable{
     }
 
     {
-      CMO[] CMOFormat = {new CMO_INT32(CMO.CMO_NULL),
-			 new CMO_INT32(CMO.CMO_INT32),
-			 new CMO_INT32(CMO.CMO_STRING),
-			 new CMO_INT32(CMO.CMO_LIST),
-			 new CMO_INT32(CMO.CMO_MONOMIAL32),
-			 new CMO_INT32(CMO.CMO_ZZ),
-			 new CMO_INT32(CMO.CMO_QQ),
-			 new CMO_INT32(CMO.CMO_ZERO),
-			 new CMO_INT32(CMO.CMO_DMS_GENERIC),
-			 new CMO_INT32(CMO.CMO_RECURSIVE_POLYNOMIAL),
-			 new CMO_INT32(CMO.CMO_DISTRIBUTED_POLYNOMIAL),
-			 new CMO_INT32(CMO.CMO_POLYNOMIAL_IN_ONE_VARIABLE),
-			 new CMO_INT32(CMO.CMO_BIGFLOAT),
-			 new CMO_INT32(CMO.CMO_INDETERMINATE),
-			 new CMO_INT32(CMO.CMO_TREE)};
-      CMO[] DataFormat1 = {new CMO_INT32(OpenXM.OX_DATA),
+      CMO[] CMOFormat = {new CMO_INT32(CMO.NULL),
+			 new CMO_INT32(CMO.INT32),
+			 new CMO_INT32(CMO.STRING),
+			 new CMO_INT32(CMO.LIST),
+			 new CMO_INT32(CMO.MONOMIAL32),
+			 new CMO_INT32(CMO.ZZ),
+			 new CMO_INT32(CMO.QQ),
+			 new CMO_INT32(CMO.ZERO),
+			 new CMO_INT32(CMO.DMS_GENERIC),
+			 new CMO_INT32(CMO.RECURSIVE_POLYNOMIAL),
+			 new CMO_INT32(CMO.DISTRIBUTED_POLYNOMIAL),
+			 new CMO_INT32(CMO.POLYNOMIAL_IN_ONE_VARIABLE),
+			 new CMO_INT32(CMO.BIGFLOAT),
+			 new CMO_INT32(CMO.INDETERMINATE),
+			 new CMO_INT32(CMO.TREE)};
+      CMO[] DataFormat1 = {new CMO_INT32(OXmessage.OX_DATA),
 			   new CMO_LIST(CMOFormat)};
       CMO[] list = {new CMO_LIST(DataFormat1)};
 
       mathcap[2] = new CMO_LIST(list);
     }
 
+    stack = new Stack();
     stack.push(new CMO_MATHCAP(new CMO_LIST(mathcap)));
     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());
+      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:
@@ -172,15 +191,15 @@ class OMproxy implements Runnable{
       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);
     }
   }
 
@@ -225,7 +244,7 @@ class OMproxy implements Runnable{
 
   private void debug(String str){
     if(debug){
-      System.out.println(str);
+      System.err.println(str);
     }
   }
 
@@ -244,41 +263,45 @@ class OMproxy implements Runnable{
     return ret;
   }
 
-  public static void main(String argv[]){
-    String host = "localhost";
-    int DataPort = 1300, ControlPort = 1200;
-    boolean debug = false;
+  public static void main(String[] argv){
+    String hostname = "localhost";
+    int ControlPort = 1200, DataPort = 1300;
+    OpenXMControlServer ox;
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-	System.out.print(usage());
-	System.exit(0);
+        System.err.println("");
+        System.exit(0);
       }else if(argv[i].equals("-host")){
-	host = argv[++i];
+        hostname = argv[++i];
       }else if(argv[i].equals("-data")){
-	DataPort = Integer.valueOf(argv[++i]).intValue();
+        DataPort = Integer.valueOf(argv[++i]).intValue();
       }else if(argv[i].equals("-control")){
-	ControlPort = Integer.valueOf(argv[++i]).intValue();
-      }else if(argv[i].equals("-insecure")){
-      }else if(argv[i].equals("-debug")){
-	debug = true;
+        ControlPort = Integer.valueOf(argv[++i]).intValue();
       }else{
-	System.err.println("unknown option : "+ argv[i]);
-	System.err.print(usage());
-	System.exit(1);
+        System.err.println("unknown option :"+ argv[i]);
+        System.exit(1);
       }
     }
 
-    System.out.println("host(ctrl,data): "+ host
-		       +"("+ ControlPort +","+ DataPort +")");
-
+    //ox = new OpenXMserver(hostname,ControlPort,DataPort);
+    ox = new OMproxy(hostname,ControlPort,DataPort);
+    /*
     try{
-      new OMproxy(host,ControlPort,DataPort).debug = debug;
-      System.out.println("connected.");
+    }catch(java.net.UnknownHostException e){
+      System.err.println("host unknown.");
+      System.err.println(e.getMessage());
+      return;
     }catch(IOException e){
-      System.err.println("Error occured: "+ e);
-      System.err.println(e.getLocalizedMessage());
+      System.err.println("connection failed.");
+      System.err.println("IOException occuer !!");
       System.err.println(e.getMessage());
+      return;
     }
+    */
+
+    ox.start();
+
+    System.err.println("breaking...");
   }
 }