===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- OpenXM/src/ox_math/math2ox.c	2000/02/14 09:39:12	1.13
+++ OpenXM/src/ox_math/math2ox.c	2000/12/03 21:57:59	1.19
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.12 2000/01/22 06:29:17 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.18 2000/11/28 20:16:03 ohara Exp $ */
 
 /* 
    Copyright (C) Katsuyoshi OHARA, 2000.
@@ -20,16 +20,14 @@
 #include <unistd.h>
 #include <signal.h>
 #include <mathlink.h>
+#include <ox_toolkit.h>
+#include "sm.h"
 
-#include "ox.h"
-#include "parse.h"
-#include "serv2.h"
-
 static char *host    = "localhost";
 static char *ctlserv = "ox";
 static char *oxprog  = "ox_sm1";
 
-static ox_file_t *ss = NULL;
+static OXFILE **ss = NULL;
 static int len_ss = 0;
 static int max_process = 0;
 
@@ -39,8 +37,8 @@ void OX_get(int id)
 {
     cmo *c = NULL;
 
-    receive_ox_tag(ss[id]->stream);
-    c = receive_cmo(ss[id]->stream);
+    receive_ox_tag(ss[id]);
+    c = receive_cmo(ss[id]);
 #ifdef DEBUG
     fprintf(stderr, "ox message is received in OxGet[].\n");
     print_cmo(c);
@@ -80,21 +78,28 @@ int OX_reset(int id)
     return 0;
 }
 
+/* This function is compatible with previous version of math2ox. */
 /* Parsing s and sending its cmo to an OX server. */
 int OX_parse(int id, char *s)
 {
+	return OX_sendMessage(id, s);
+}
+
+/* After creating an OX message by parsing a string s, 
+   the function send the message to the OX server id. */
+int OX_sendMessage(int id, char *s)
+{
     cmo *m;
-    symbol *symp;
     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]->stream, ((ox_data *)m)->cmo);
+            send_ox_cmo(ss[id], ((ox_data *)m)->cmo);
         }else if (m->tag == OX_COMMAND) {
-            send_ox_command(ss[id]->stream, ((ox_command *)m)->command);
+            send_ox_command(ss[id], ((ox_command *)m)->command);
         }else {
-            send_ox_cmo(ss[id]->stream, m);     
+            send_ox_cmo(ss[id], m);     
         }
         return 0;
     }
@@ -143,7 +148,7 @@ int OX_start_insecure(char *host, int portCtl, int por
     }
     
 	if (++max_process < len_ss) {
-		ss[max_process] = ox_start_insecure_nonreverse(host, portCtl, portDat);
+		ss[max_process] = ox_start_insecure(host, portCtl, portDat);
 		fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat);
 		return max_process;
 	}
@@ -166,28 +171,32 @@ int OX_setClientParam(char *h, char* c, char* p)
     return 0;
 }
 
-static ox_file_t *new_sstack(int size)
+static OXFILE **new_sstack(int size)
 {
 	max_process = 0;
 	len_ss = size;
-	return (ox_file_t *)malloc(sizeof(ox_file_t)*len_ss);
+	return (OXFILE **)malloc(sizeof(OXFILE *)*len_ss);
 }
 
-static ox_file_t ss_id(int id)
+static OXFILE *ss_id(int id)
 {
 	return ss[id];
 }
 
 static int  ss_id_stream(int id)
 {
-	return ss[id]->stream;
+	return ss[id];
 }
 
+#define VERSION 0x11121400
+#define ID_STRING  "2000/11/29"
+
 int main(int argc, char *argv[])
 {
     /* setting the OX parser */
     setflag_parse(PFLAG_ADDREV);
 	ss = new_sstack(20);
+    mathcap_init(VERSION, ID_STRING, "math2ox", NULL, NULL);
     
     MLMain(argc, argv);
 }