===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.7
retrieving revision 1.16
diff -u -p -r1.7 -r1.16
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/07 21:14:38	1.7
+++ OpenXM/src/OpenMath/OMproxy.java	2000/01/13 12:35:56	1.16
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.6 1999/11/04 18:38:59 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.15 1999/11/25 12:17:31 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,11 +54,13 @@ class OMproxy implements Runnable{
       System.out.println("OMproxy Stopped");
     }
   }
+  */
 
   private void SM_popCMO() throws java.io.IOException{
     if(stack.empty()){
       ox.send(new CMO_NULL());
     }else{
+      debug("sending CMO: "+ stack.peek());
       ox.send(stack.pop());
     }
   }
@@ -99,9 +102,9 @@ class OMproxy implements Runnable{
     CMO[] mathcap = new CMO[3];
 
     {
-      CMO[] list = {new CMO_INT32(199911070),
+      CMO[] list = {new CMO_INT32(version),
 		  new CMO_STRING("Ox_system=OMproxy.class"),
-		  new CMO_STRING("Version=0.199911070"),
+		  new CMO_STRING("Version=0."+ version),
 		  new CMO_STRING("HOSTTYPE=JAVA")};
       mathcap[0] = new CMO_LIST(list);
     }
@@ -109,26 +112,37 @@ 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),
+			 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)};
-      CMO[] list = {new CMO_LIST(DataFormat),
-		    new CMO_LIST(CMOFormat)};
+			 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),
+			   new CMO_LIST(CMOFormat)};
+      CMO[] list = {new CMO_LIST(DataFormat1)};
+
       mathcap[2] = new CMO_LIST(list);
     }
 
-    ox.send(new CMO_LIST(mathcap));
+    stack.push(new CMO_MATHCAP(new CMO_LIST(mathcap)));
+    debug("push: "+ stack.peek());
   }
 
   private void StackMachine(SM mesg) throws java.io.IOException{
@@ -153,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);
   }
 
@@ -166,7 +187,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{
@@ -175,6 +196,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);
@@ -196,10 +220,13 @@ class OMproxy implements Runnable{
     ret += "\t -host hostname \t (default localhost)\n";
     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";
 
     return ret;
   }
 
+  private static native void setNoInterrupt();
+
   public static void main(String argv[]){
     String host = "localhost";
     int DataPort = 1300, ControlPort = 1200;
@@ -214,12 +241,16 @@ class OMproxy implements Runnable{
 	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{
 	System.err.println("unknown option : "+ argv[i]);
 	System.err.print(usage());
 	System.exit(1);
       }
     }
+
+    //System.loadLibrary("native");
+    //setNoInterrupt();
 
     System.out.println("host(ctrl,data): "+ host
 		       +"("+ ControlPort +","+ DataPort +")");