===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/03 07:19:16	1.3
+++ OpenXM/src/OpenMath/OMproxy.java	1999/11/09 09:43:48	1.8
@@ -1,5 +1,5 @@
 /**
- * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.2 1999/11/02 13:09:19 tam Exp $
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.7 1999/11/07 21:14:38 tam Exp $
  */
 
 import JP.ac.kobe_u.math.tam.OpenXM.*;
@@ -9,6 +9,7 @@ import java.io.*;
 class OMproxy implements Runnable{
   private OpenXM ox;
   private Stack stack = new Stack();
+  private boolean debug = true;
 
   public OMproxy(String host,int ControlPort,int DataPort) throws IOException{
     ox = new OpenXM(this,host,ControlPort,DataPort);
@@ -29,7 +30,7 @@ class OMproxy implements Runnable{
 
 	  case OpenXM.OX_DATA:
 	    stack.push(ox.receiveCMO());
-	    System.out.println("push: "+ stack.peek());
+	    debug("push: "+ stack.peek());
 	    break;
 	  }
 	}
@@ -57,6 +58,7 @@ class OMproxy implements Runnable{
     if(stack.empty()){
       ox.send(new CMO_NULL());
     }else{
+      debug("pushing CMO: "+ stack.peek());
       ox.send(stack.pop());
     }
   }
@@ -94,7 +96,46 @@ class OMproxy implements Runnable{
     return;
   }
 
+  private void SM_mathcap() throws java.io.IOException{
+    CMO[] mathcap = new CMO[3];
+
+    {
+      CMO[] list = {new CMO_INT32(199911090),
+		  new CMO_STRING("Ox_system=OMproxy.class"),
+		  new CMO_STRING("Version=0.199911090"),
+		  new CMO_STRING("HOSTTYPE=JAVA")};
+      mathcap[0] = new CMO_LIST(list);
+    }
+
+    {
+      CMO[] list = {new CMO_INT32(SM.SM_popCMO),
+		    new CMO_INT32(SM.SM_executeFunction),
+		    new CMO_INT32(SM.SM_mathcap)};
+      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_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)};
+      mathcap[2] = new CMO_LIST(list);
+    }
+
+    stack.push(new CMO_MATHCAP(new CMO_LIST(mathcap)));
+    debug("push: "+ stack.peek());
+  }
+
   private void StackMachine(SM mesg) throws java.io.IOException{
+    debug("receive: "+mesg);
+
     switch(mesg.getCode()){
     case SM.SM_popCMO:
       SM_popCMO();
@@ -104,6 +145,10 @@ class OMproxy implements Runnable{
       SM_executeFunction();
       break;
 
+    case SM.SM_mathcap:
+      SM_mathcap();
+      break;
+
     default:
       System.out.println("received "+ mesg);
     }
@@ -121,7 +166,8 @@ class OMproxy implements Runnable{
     ByteArrayInputStream stream;
     CMO ret;
 
-    if(obj instanceof CMO_STRING){
+    debug("OMXML2CMO called: "+obj);
+    if(!(obj instanceof CMO_STRING)){
       return new CMO_ERROR2();
     }
 
@@ -129,12 +175,20 @@ class OMproxy implements Runnable{
       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()));
     }
 
+    debug("push: "+ret);
     return ret;
   }
 
+  private void debug(String str){
+    if(debug){
+      System.out.println(str);
+    }
+  }
+
   private static String usage(){
     String ret = "";
 
@@ -144,6 +198,7 @@ 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;
   }
@@ -162,6 +217,7 @@ 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());