===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -p -r1.8 -r1.12
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/09 09:43:48	1.8
+++ OpenXM/src/OpenMath/OMproxy.java	1999/11/17 08:47:55	1.12
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.7 1999/11/07 21:14:38 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.11 1999/11/16 13:16:22 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -10,6 +10,7 @@ class OMproxy implements Runnable{
   private OpenXM ox;
   private Stack stack = new Stack();
   private boolean debug = true;
+  final int version = 199911110;
 
   public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
     ox = new OpenXM(this,host,ControlPort,DataPort);
@@ -18,21 +19,20 @@ class OMproxy implements Runnable{
   public void run(){
     OM2OXM P = new OM2OXM();
 
+    debug("OMproxy started.");
     try{
       while(true){
-	synchronized(ox){
-	  int ox_tag = ox.receiveOXtag();
+	int ox_tag = ox.receiveOXtag();
 
-	  switch(ox_tag){
-	  case OpenXM.OX_COMMAND:
-	    StackMachine(ox.receiveSM());
-	    break;
+	switch(ox_tag){
+	case OpenXM.OX_COMMAND:
+	  StackMachine(ox.receiveSM());
+	  break;
 
-	  case OpenXM.OX_DATA:
-	    stack.push(ox.receiveCMO());
-	    debug("push: "+ stack.peek());
-	    break;
-	  }
+	case OpenXM.OX_DATA:
+	  stack.push(ox.receiveCMO());
+	  debug("push: "+ stack.peek());
+	  break;
 	}
       }
     }catch(java.io.IOException e){
@@ -43,6 +43,7 @@ class OMproxy implements Runnable{
     System.out.println("breaking...");
   }
 
+  /*
   public void stop(){
     System.out.println("OMproxy Stoping...");
     synchronized(ox){
@@ -53,6 +54,7 @@ class OMproxy implements Runnable{
       System.out.println("OMproxy Stopped");
     }
   }
+  */
 
   private void SM_popCMO() throws java.io.IOException{
     if(stack.empty()){
@@ -100,9 +102,9 @@ class OMproxy implements Runnable{
     CMO[] mathcap = new CMO[3];
 
     {
-      CMO[] list = {new CMO_INT32(199911090),
+      CMO[] list = {new CMO_INT32(version),
 		  new CMO_STRING("Ox_system=OMproxy.class"),
-		  new CMO_STRING("Version=0.199911090"),
+		  new CMO_STRING("Version=0."+ version),
 		  new CMO_STRING("HOSTTYPE=JAVA")};
       mathcap[0] = new CMO_LIST(list);
     }
@@ -110,7 +112,9 @@ class OMproxy implements Runnable{
     {
       CMO[] list = {new CMO_INT32(SM.SM_popCMO),
 		    new CMO_INT32(SM.SM_executeFunction),
-		    new CMO_INT32(SM.SM_mathcap)};
+		    new CMO_INT32(SM.SM_mathcap),
+		    new CMO_INT32(SM.SM_control_kill),
+		    new CMO_INT32(SM.SM_control_reset_connection)};
       mathcap[1] = new CMO_LIST(list);
     }
 
@@ -119,11 +123,18 @@ 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_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[] list = {new CMO_LIST(DataFormat),
 		    new CMO_LIST(CMOFormat)};
       mathcap[2] = new CMO_LIST(list);
@@ -155,8 +166,15 @@ class OMproxy implements Runnable{
   }
 
   private CMO CMO2OMXML(CMO obj){
-    String str = OM2OXM.CMO2OM(obj);
+    String str;
 
+    try{
+      str = OM2OXM.CMO2OM(obj);
+    }catch(NumberFormatException e){
+      debug("CMO2OMXML occuered error in trans");
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
+    }
+
     return new CMO_STRING(str);
   }
 
@@ -168,13 +186,16 @@ class OMproxy implements Runnable{
 
     debug("OMXML2CMO called: "+obj);
     if(!(obj instanceof CMO_STRING)){
-      return new CMO_ERROR2();
+      return new CMO_ERROR2(new CMO_STRING("It's not CMO_STRING."));
     }
 
     try{
       stream = new ByteArrayInputStream(((CMO_STRING)obj).getString().getBytes());
       ret = trans.parse(stream);
     }catch(IOException e){
+      debug("OMXML2CMO occuered error in trans");
+      return new CMO_ERROR2(new CMO_STRING(e.toString()));
+    }catch(NumberFormatException e){
       debug("OMXML2CMO occuered error in trans");
       return new CMO_ERROR2(new CMO_STRING(e.toString()));
     }