===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v
retrieving revision 1.1.1.1
retrieving revision 1.17
diff -u -p -r1.1.1.1 -r1.17
--- OpenXM/src/ox_math/math2ox.c	1999/10/29 08:06:42	1.1.1.1
+++ OpenXM/src/ox_math/math2ox.c	2000/10/10 19:58:29	1.17
@@ -1,7 +1,15 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM$ */
-/* $Id: math2ox.c,v 1.1.1.1 1999/10/29 08:06:42 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.16 2000/03/13 09:44:06 ohara Exp $ */
 
+/* 
+   Copyright (C) Katsuyoshi OHARA, 2000.
+   Portions copyright 1999 Wolfram Research, Inc. 
+
+   You must see OpenXM/Copyright/Copyright.generic.
+   The MathLink Library is licensed from Wolfram Research Inc..
+   See OpenXM/Copyright/Copyright.mathlink for detail.
+*/
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -11,51 +19,143 @@
 #include <mathlink.h>
 #include <unistd.h>
 #include <signal.h>
+#include <mathlink.h>
+#include <ox_toolkit.h>
+#include "serv2.h"
 
-#include "ox.h"
-
 static char *host    = "localhost";
 static char *ctlserv = "ox";
 static char *oxprog  = "ox_sm1";
 
-ox_file_t sv;
+static OXFILE **ss = NULL;
+static int len_ss = 0;
+static int max_process = 0;
 
-/* Mathematica から直接呼び出される関数の定義. */
-/* 呼び出しの方法は math2ox.tm で定義される.   */
-int OX_executeStringByLocalParser(const char *str)
+/* The following functions are called from Mathematica.
+   See math2.tm for detail. */
+void OX_get(int id)
 {
-    ox_executeStringByLocalParser(sv, str);
+    cmo *c = NULL;
+
+    receive_ox_tag(ss[id]);
+    c = receive_cmo(ss[id]);
+#ifdef DEBUG
+    fprintf(stderr, "ox message is received in OxGet[].\n");
+    print_cmo(c);
+    fflush(stderr);
+#endif
+    send_mlo(c);
+	ml_flush();
+}
+
+int OX_execute_string(int id, const char *str)
+{
+    ox_execute_string(ss[id], str);
     return 0;
 }
 
-char *OX_popString()
+char *OX_popString(int id)
 {
-    return ox_popString(sv, sv->stream);
+    return ox_popString(ss[id]);
 }
 
-int OX_close()
+void OX_popCMO(int id)
 {
-    ox_close(sv);
+    cmo *c = ox_pop_cmo(ss[id]);
+    send_mlo(c);
+	ml_flush();
+}
+
+int OX_close(int id)
+{
+    ox_close(ss[id]);
     return 0;
 }
 
-int OX_reset()
+int OX_reset(int id)
 {
-    ox_reset(sv);
+    ox_reset(ss[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;
+    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);     
+        }
+        return 0;
+    }
+    return -1; /* if we failed. */
+}
+
 int OX_start(char* s)
 {
     if (s != NULL && s[0] != '\0') {
         oxprog = s;
     }
-    sv = ox_start(host, ctlserv, oxprog);
-    fprintf(stderr, "open (%s)\n", "localhost");
-    return 0;
+	if (++max_process < len_ss) {
+		ss[max_process] = ox_start(host, ctlserv, oxprog);
+		fprintf(stderr, "open (%s)\n", "localhost");
+		return max_process;
+	}
+	return -1;
 }
 
+int OX_start_remote_ssh(char *s, char *host)
+{
+    if (s != NULL && s[0] != '\0') {
+        oxprog = s;
+    }
+    if (host != NULL || host[0] == '\0') {
+        host = "localhost";
+    }
+	if (++max_process < len_ss) {
+		ss[max_process] = ox_start_remote_with_ssh(oxprog, host);
+		fprintf(stderr, "open (%s)\n", host);
+		return max_process;
+	}
+    return -1;
+}
+
+int OX_start_insecure(char *host, int portCtl, int portDat)
+{
+    if (host != NULL || host[0] == '\0') {
+        host = "localhost";
+    }
+    if (portCtl == 0) {
+        portCtl = 1200;
+    }
+    if (portDat == 0) {
+        portDat = 1300;
+    }
+    
+	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);
+		return max_process;
+	}
+
+    return -1;
+}
+
 static char *cp_str(char *src)
 {
     char *dest = malloc(strlen(src)+1);
@@ -71,7 +171,28 @@ int OX_setClientParam(char *h, char* c, char* p)
     return 0;
 }
 
+static OXFILE **new_sstack(int size)
+{
+	max_process = 0;
+	len_ss = size;
+	return (OXFILE **)malloc(sizeof(OXFILE *)*len_ss);
+}
+
+static OXFILE *ss_id(int id)
+{
+	return ss[id];
+}
+
+static int  ss_id_stream(int id)
+{
+	return ss[id];
+}
+
 int main(int argc, char *argv[])
 {
+    /* setting the OX parser */
+    setflag_parse(PFLAG_ADDREV);
+	ss = new_sstack(20);
+    
     MLMain(argc, argv);
 }