===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.30
retrieving revision 1.37
diff -u -p -r1.30 -r1.37
--- OpenXM/src/OpenMath/OMproxy.java	2000/03/12 14:24:21	1.30
+++ OpenXM/src/OpenMath/OMproxy.java	2000/06/13 14:04:19	1.37
@@ -1,37 +1,38 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.29 2000/01/21 07:33:18 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.36 2000/04/17 03:18:57 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
 import java.util.Stack;
 import java.io.*;
 
-class OMproxy implements Runnable{
+public class OMproxy extends OpenXMserver{
   private OpenXM ox;
   private Stack stack = new Stack();
-  protected boolean debug = false;
-  final int version = 200001190;
+  protected boolean debug = true;
+  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(OpenXMconnection stream){
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
     try{
       while(true){
 	try{
-	  int ox_tag = ox.receiveOXtag();
+	  OXmessage message = stream.receive();
+	  int ox_tag = message.getTag();
 
 	  switch(ox_tag){
-	  case OpenXM.OX_COMMAND:
-	    StackMachine(ox.receiveSM());
+	  case OXmessage.OX_COMMAND:
+	    StackMachine((SM)message.getBody());
 	    break;
 
-	  case OpenXM.OX_DATA:
-	    stack.push(ox.receiveCMO());
+	  case OXmessage.OX_DATA:
+	    stack.push(message.getBody());
 	    debug("push: "+ stack.peek());
 	    break;
 	  }
@@ -39,6 +40,7 @@ class OMproxy implements Runnable{
 	  System.err.println(e.getMessage());
 	  e.printStackTrace();
 	  debug("error occured. stack was cleared.");
+	  stack = new Stack();
 	}
       }
     }catch(IOException e){
@@ -69,11 +71,12 @@ class OMproxy implements Runnable{
 	ox.send(new CMO_NULL());
       }else{
 	debug("sending CMO: "+ stack.peek());
-	ox.send(stack.pop());
+	ox.send((CMO)stack.pop());
+	debug("test");
       }
     }catch(MathcapViolation e){
       try{
-	ox.send(new cmoError2(new CMO_STRING("MathcapViolation: "+
+	ox.send(new CMO_ERROR2(new CMO_STRING("MathcapViolation: "+
 					      e.getMessage())));
       }catch(MathcapViolation tmp){}
     }
@@ -85,7 +88,7 @@ class OMproxy implements Runnable{
     int argc;
 
     if(!(stack.peek() instanceof CMO_STRING)){
-      stack.push(new cmoError2(new cmoNull()));
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
     function_name = ((CMO_STRING)stack.pop()).getString();
@@ -96,7 +99,7 @@ class OMproxy implements Runnable{
     }
 
     if(argc != 1){
-      stack.push(new cmoError2(new cmoNull()));
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
       return;
     }
 
@@ -108,7 +111,7 @@ class OMproxy implements Runnable{
       return;
     }
 
-    stack.push(new cmoError2(new cmoNull()));
+    stack.push(new CMO_ERROR2(new CMO_NULL()));
     return;
   }
 
@@ -134,28 +137,29 @@ 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());
   }
@@ -164,7 +168,7 @@ class OMproxy implements Runnable{
     Object mathcap = stack.pop();
 
     if(mathcap instanceof CMO_MATHCAP){
-      stack.push(new cmoError2(new cmoNull()));
+      stack.push(new CMO_ERROR2(new CMO_NULL()));
     }
     ox.setMathCap((CMO_MATHCAP)mathcap);
   }
@@ -201,7 +205,7 @@ class OMproxy implements Runnable{
       str = OM2OXM.CMO2OM(obj);
     }catch(NumberFormatException e){
       debug("CMO2OMXML occuered error in trans");
-      return new cmoError2(new CMO_STRING(e.toString()));
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }
 
     return new CMO_STRING(str);
@@ -215,7 +219,7 @@ class OMproxy implements Runnable{
 
     debug("OMXML2CMO called: "+obj);
     if(!(obj instanceof CMO_STRING)){
-      return new cmoError2(new CMO_STRING("It's not CMO_STRING."));
+      return new CMO_ERROR2(new CMO_STRING("It's not CMO_STRING."));
     }
 
     try{
@@ -223,10 +227,10 @@ class OMproxy implements Runnable{
       ret = trans.parse(stream);
     }catch(IOException e){
       debug("OMXML2CMO occuered error in trans");
-      return new cmoError2(new CMO_STRING(e.toString()));
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }catch(NumberFormatException e){
       debug("OMXML2CMO occuered error in trans");
-      return new cmoError2(new CMO_STRING(e.toString()));
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }
 
     debug("push: "+ret);
@@ -234,9 +238,9 @@ class OMproxy implements Runnable{
   }
 
   private void debug(String str){
-    if(debug){
-      System.out.println(str);
-    }
+    //if(debug){
+    System.err.println(str);
+    //}
   }
 
   private static String usage(){
@@ -254,41 +258,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;
+    OpenXMserver ox;
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-	System.out.print(usage());
-	System.exit(0);
+        System.out.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.out.println("breaking...");
   }
 }