===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.1.1.1
retrieving revision 1.6
diff -u -p -r1.1.1.1 -r1.6
--- OpenXM/src/OpenMath/OMproxy.java	1999/11/02 11:52:34	1.1.1.1
+++ OpenXM/src/OpenMath/OMproxy.java	1999/11/04 18:38:59	1.6
@@ -1,3 +1,7 @@
+/**
+ * $OpenXM: OpenXM/src/OpenMath/OMproxy.java,v 1.5 1999/11/04 18:24:16 tam Exp $
+ */
+
 import JP.ac.kobe_u.math.tam.OpenXM.*;
 import java.util.Stack;
 import java.io.*;
@@ -5,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);
@@ -25,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;
 	  }
 	}
@@ -60,14 +65,14 @@ class OMproxy implements Runnable{
   private void SM_executeFunction() throws java.io.IOException{
     String function_name;
     CMO[] argv;
-    int argc;
+    int argc = 1;
 
     if(!(stack.peek() instanceof CMO_STRING)){
       stack.push(new CMO_ERROR2());
       return;
     }
     function_name = ((CMO_STRING)stack.pop()).getString();
-    argc = ((CMO_INT32)stack.pop()).intValue();
+    //argc = ((CMO_INT32)stack.pop()).intValue();
     argv = new CMO[argc];
     for(int i=0;i<argc;i++){
       argv[i] = (CMO)stack.pop();
@@ -91,6 +96,8 @@ class OMproxy implements Runnable{
   }
 
   private void StackMachine(SM mesg) throws java.io.IOException{
+    debug("receive: "+mesg);
+
     switch(mesg.getCode()){
     case SM.SM_popCMO:
       SM_popCMO();
@@ -117,7 +124,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();
     }
 
@@ -125,19 +133,40 @@ 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 = "";
+
+    ret += "usage\t: java OMproxy [options]\n";
+    ret += "options\t:\n";
+    ret += "\t -h \t show this message\n";
+    ret += "\t -host hostname \t (default localhost)\n";
+    ret += "\t -data port \t (default 1300)\n";
+    ret += "\t -control port \t (default 1200)\n";
+
+    return ret;
+  }
+
   public static void main(String argv[]){
     String host = "localhost";
     int DataPort = 1300, ControlPort = 1200;
 
     for(int i=0;i<argv.length;i++){
       if(argv[i].equals("-h")){
-	System.out.println("");
+	System.out.print(usage());
 	System.exit(0);
       }else if(argv[i].equals("-host")){
 	host = argv[++i];
@@ -146,10 +175,12 @@ class OMproxy implements Runnable{
       }else if(argv[i].equals("-control")){
 	ControlPort = Integer.valueOf(argv[++i]).intValue();
       }else{
-	System.err.println("unknown option :"+ argv[i]);
+	System.err.println("unknown option : "+ argv[i]);
+	System.err.print(usage());
 	System.exit(1);
       }
     }
+
     System.out.println("host(ctrl,data): "+ host
 		       +"("+ ControlPort +","+ DataPort +")");