===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -p -r1.19 -r1.23
--- OpenXM/src/ox_math/math2ox.c	2000/12/03 21:57:59	1.19
+++ OpenXM/src/ox_math/math2ox.c	2005/07/20 17:48:03	1.23
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.18 2000/11/28 20:16:03 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.22 2003/02/04 14:22:04 ohara Exp $ */
 
 /* 
    Copyright (C) Katsuyoshi OHARA, 2000.
@@ -21,7 +21,6 @@
 #include <signal.h>
 #include <mathlink.h>
 #include <ox_toolkit.h>
-#include "sm.h"
 
 static char *host    = "localhost";
 static char *ctlserv = "ox";
@@ -39,11 +38,8 @@ void OX_get(int id)
 
     receive_ox_tag(ss[id]);
     c = receive_cmo(ss[id]);
-#ifdef DEBUG
-    fprintf(stderr, "ox message is received in OxGet[].\n");
+    ox_printf("ox message is received in OxGet[].\n");
     print_cmo(c);
-    fflush(stderr);
-#endif
     send_mlo(c);
 	ml_flush();
 }
@@ -89,18 +85,9 @@ int OX_parse(int id, char *s)
    the function send the message to the OX server id. */
 int OX_sendMessage(int id, char *s)
 {
-    cmo *m;
-    int len = strlen(s);
-    init_parser(s);
-
-    if(s != NULL && len > 0 && (m = parse()) != NULL) {
-        if (m->tag == OX_DATA) {
-            send_ox_cmo(ss[id], ((ox_data *)m)->cmo);
-        }else if (m->tag == OX_COMMAND) {
-            send_ox_command(ss[id], ((ox_command *)m)->command);
-        }else {
-            send_ox_cmo(ss[id], m);     
-        }
+    cmo *m = ox_parse_lisp(s);
+    if(m != NULL) {
+        send_ox(ss[id], m);
         return 0;
     }
     return -1; /* if we failed. */
@@ -113,7 +100,7 @@ int OX_start(char* s)
     }
 	if (++max_process < len_ss) {
 		ss[max_process] = ox_start(host, ctlserv, oxprog);
-		fprintf(stderr, "open (%s)\n", "localhost");
+		ox_printf("open (%s)\n", "localhost");
 		return max_process;
 	}
 	return -1;
@@ -129,7 +116,7 @@ int OX_start_remote_ssh(char *s, char *host)
     }
 	if (++max_process < len_ss) {
 		ss[max_process] = ox_start_remote_with_ssh(oxprog, host);
-		fprintf(stderr, "open (%s)\n", host);
+		ox_printf("open (%s)\n", host);
 		return max_process;
 	}
     return -1;
@@ -149,7 +136,7 @@ int OX_start_insecure(char *host, int portCtl, int por
     
 	if (++max_process < len_ss) {
 		ss[max_process] = ox_start_insecure(host, portCtl, portDat);
-		fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat);
+		ox_printf("math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat);
 		return max_process;
 	}
 
@@ -193,9 +180,9 @@ static int  ss_id_stream(int id)
 
 int main(int argc, char *argv[])
 {
-    /* setting the OX parser */
-    setflag_parse(PFLAG_ADDREV);
-	ss = new_sstack(20);
+    ox_stderr_init(NULL);
+
+    ss = new_sstack(20);
     mathcap_init(VERSION, ID_STRING, "math2ox", NULL, NULL);
     
     MLMain(argc, argv);