===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -p -r1.7 -r1.9
--- OpenXM/src/ox_math/math2ox.c	1999/11/19 20:51:36	1.7
+++ OpenXM/src/ox_math/math2ox.c	1999/12/14 09:31:55	1.9
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.6 1999/11/07 12:12:55 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.8 1999/11/29 12:09:57 ohara Exp $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -21,39 +21,43 @@ static char *ctlserv = "ox";
 static char *oxprog  = "ox_sm1";
 
 ox_file_t sv;
-MLINK lp;
+static ox_file_t *svs = NULL;
+static int len_svs = 0;
+static int max_process = 0;
 
 /* Mathematica から直接呼び出される関数の定義. */
 /* 呼び出しの方法は math2ox.tm で定義される.   */
-void OX_receive()
+void OX_get()
 {
-	cmo *c = NULL;
+    cmo *c = NULL;
 
-	receive_ox_tag(sv->stream);
-	c = receive_cmo(sv->stream);
+    receive_ox_tag(sv->stream);
+    c = receive_cmo(sv->stream);
 #ifdef DEBUG
-	fprintf(stderr, "received ox in OxReceive[].\n");
-	print_cmo(c);
-	fflush(stderr);
+    fprintf(stderr, "ox message is received in OxGet[].\n");
+    print_cmo(c);
+    fflush(stderr);
 #endif
-	MATH_sendObject(c);
+    send_mlo(c);
+	ml_flush();
 }
 
-int OX_executeStringByLocalParser(const char *str)
+int OX_execute_string(const char *str)
 {
-    ox_executeStringByLocalParser(sv, str);
+    ox_execute_string(sv, str);
     return 0;
 }
 
 char *OX_popString()
 {
-    return ox_popString(sv, sv->stream);
+    return ox_popString(sv);
 }
 
 void OX_popCMO()
 {
-    cmo *c = ox_pop_cmo(sv, sv->stream);
-	MATH_sendObject(c);
+    cmo *c = ox_pop_cmo(sv);
+    send_mlo(c);
+	ml_flush();
 }
 
 int OX_close()
@@ -94,10 +98,13 @@ 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");
-	lp = stdlink;
-    return 0;
+	if (++max_process < len_svs) {
+		sv = ox_start(host, ctlserv, oxprog);
+		fprintf(stderr, "open (%s)\n", "localhost");
+		svs[max_process] = sv;
+		return max_process;
+	}
+	return -1;
 }
 
 int OX_start_insecure(char *host, int portCtl, int portDat)
@@ -115,8 +122,6 @@ int OX_start_insecure(char *host, int portCtl, int por
     sv = ox_start_insecure_nonreverse(host, portCtl, portDat);
     fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat);
 
-	lp = stdlink;
-
     return 0;
 }
 
@@ -140,6 +145,9 @@ int main(int argc, char *argv[])
     /* 構文解析器の設定 */
     setflag_parse(PFLAG_ADDREV);
     setgetc(mygetc);
-	
+
+	len_svs = 20;
+	svs = (ox_file_t *)malloc(sizeof(ox_file_t)*len_svs);
+    
     MLMain(argc, argv);
 }