===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.9
retrieving revision 1.24
diff -u -p -r1.9 -r1.24
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/11 17:18:48	1.9
+++ OpenXM/src/OpenMath/OMproxy.java	2000/01/20 18:14:32	1.24
@@ -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.23 2000/01/20 16:40:13 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -9,8 +9,8 @@ import java.io.*;
 class OMproxy implements Runnable{
   private OpenXM ox;
   private Stack stack = new Stack();
-  private boolean debug = true;
-  final int version = 199911110;
+  protected boolean debug = false;
+  final int version = 200001190;
 
   public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
     ox = new OpenXM(this,host,ControlPort,DataPort);
@@ -20,8 +20,8 @@ class OMproxy implements Runnable{
     OM2OXM P = new OM2OXM();
 
     debug("OMproxy started.");
-    try{
-      while(true){
+    while(true){
+      try{
 	int ox_tag = ox.receiveOXtag();
 
 	switch(ox_tag){
@@ -34,13 +34,13 @@ class OMproxy implements Runnable{
 	  debug("push: "+ stack.peek());
 	  break;
 	}
+      }catch(Throwable e){
+	System.err.println(e.getMessage());
+	e.printStackTrace();
+	debug("error occured. stack was cleared.");
       }
-    }catch(java.io.IOException e){
-      System.err.println(e.getMessage());
-      e.printStackTrace();
     }
-
-    System.out.println("breaking...");
+    //System.out.println("breaking...");
   }
 
   /*
@@ -57,11 +57,15 @@ class OMproxy implements Runnable{
   */
 
   private void SM_popCMO() throws java.io.IOException{
-    if(stack.empty()){
-      ox.send(new CMO_NULL());
-    }else{
-      debug("pushing CMO: "+ stack.peek());
-      ox.send(stack.pop());
+    try{
+      if(stack.empty()){
+	ox.send(new CMO_NULL());
+      }else{
+	debug("sending CMO: "+ stack.peek());
+	ox.send(stack.pop());
+      }
+    }catch(MathcapViolation e){
+      stack.push(new CMO_STRING(e.getMessage()));
     }
   }
 
@@ -112,12 +116,14 @@ 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_setMathCap),
+		    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 +132,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 +172,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,7 +192,7 @@ 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{
@@ -181,6 +201,9 @@ class OMproxy implements Runnable{
     }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()));
     }
 
     debug("push: "+ret);
@@ -203,6 +226,7 @@ class OMproxy implements Runnable{
     ret += "\t -data port \t (default 1300)\n";
     ret += "\t -control port \t (default 1200)\n";
     ret += "\t -insecure \t this version ignore this option\n";
+    ret += "\t -debug \t display debug messages\n";
 
     return ret;
   }
@@ -210,6 +234,7 @@ class OMproxy implements Runnable{
   public static void main(String argv[]){
     String host = "localhost";
     int DataPort = 1300, ControlPort = 1200;
+    boolean debug = false;
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
@@ -222,6 +247,8 @@ class OMproxy implements Runnable{
       }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;
       }else{
 	System.err.println("unknown option : "+ argv[i]);
 	System.err.print(usage());
@@ -233,7 +260,7 @@ class OMproxy implements Runnable{
 		       +"("+ ControlPort +","+ DataPort +")");
 
     try{
-      new OMproxy(host,ControlPort,DataPort);
+      new OMproxy(host,ControlPort,DataPort).debug = debug;
       System.out.println("connected.");
     }catch(IOException e){
       System.err.println("Error occured: "+ e);