===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -p -r1.9 -r1.15
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/11 17:18:48	1.9
+++ OpenXM/src/OpenMath/OMproxy.java	1999/11/25 12:17:31	1.15
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.8 1999/11/09 09:43:48 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.14 1999/11/19 08:49:06 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -60,7 +60,7 @@ class OMproxy implements Runnable{
     if(stack.empty()){
       ox.send(new CMO_NULL());
     }else{
-      debug("pushing CMO: "+ stack.peek());
+      debug("sending CMO: "+ stack.peek());
       ox.send(stack.pop());
     }
   }
@@ -112,12 +112,13 @@ 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);
     }
 
     {
-      CMO[] DataFormat = {new CMO_INT32(OpenXM.OX_DATA)};
       CMO[] CMOFormat = {new CMO_INT32(CMO.CMO_NULL),
 			 new CMO_INT32(CMO.CMO_INT32),
 			 new CMO_INT32(CMO.CMO_STRING),
@@ -126,10 +127,17 @@ class OMproxy implements Runnable{
 			 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_DMS_GENERIC)};
-      CMO[] list = {new CMO_LIST(DataFormat),
-		    new CMO_LIST(CMOFormat)};
+			 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),
+			   new CMO_LIST(CMOFormat)};
+      CMO[] list = {new CMO_LIST(DataFormat1)};
+
       mathcap[2] = new CMO_LIST(list);
     }
 
@@ -159,8 +167,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);
   }
 
@@ -172,13 +187,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()));
     }