===================================================================
RCS file: /home/cvs/OpenXM/src/OpenMath/OMproxy.java,v
retrieving revision 1.18
retrieving revision 1.24
diff -u -p -r1.18 -r1.24
--- OpenXM/src/OpenMath/OMproxy.java	2000/01/18 12:47:03	1.18
+++ 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.17 2000/01/18 07:59:19 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("sending 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()));
     }
   }
 
@@ -222,16 +226,15 @@ 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 -nohup \t ignore signals (required libnative.so)\n";
+    ret += "\t -debug \t display debug messages\n";
 
     return ret;
   }
 
-  private static native void setNoInterrupt();
-
   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")){
@@ -244,9 +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("-nohup")){
-	System.loadLibrary("native");
-	setNoInterrupt();
+      }else if(argv[i].equals("-debug")){
+	debug = true;
       }else{
 	System.err.println("unknown option : "+ argv[i]);
 	System.err.print(usage());
@@ -258,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);