=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v retrieving revision 1.1.1.1 retrieving revision 1.12 diff -u -p -r1.1.1.1 -r1.12 --- OpenXM/src/ox_math/math2ox.c 1999/10/29 08:06:42 1.1.1.1 +++ OpenXM/src/ox_math/math2ox.c 2000/01/22 06:29:17 1.12 @@ -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.11 2000/01/20 15:32:21 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 #include #include @@ -11,28 +19,56 @@ #include #include #include +#include #include "ox.h" +#include "parse.h" +#include "serv2.h" static char *host = "localhost"; static char *ctlserv = "ox"; static char *oxprog = "ox_sm1"; ox_file_t sv; +static ox_file_t *svs = NULL; +static int len_svs = 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() { - ox_executeStringByLocalParser(sv, str); + cmo *c = NULL; + + receive_ox_tag(sv->stream); + c = receive_cmo(sv->stream); +#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(const char *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); + send_mlo(c); + ml_flush(); +} + int OX_close() { ox_close(sv); @@ -45,14 +81,73 @@ int OX_reset() return 0; } +/* Parsing s and sending its cmo to an OX server. */ +int OX_parse(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(sv->stream, ((ox_data *)m)->cmo); + }else if (m->tag == OX_COMMAND) { + send_ox_command(sv->stream, ((ox_command *)m)->command); + }else { + send_ox_cmo(sv->stream, 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"); + 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_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_svs) { + sv = ox_start_remote_with_ssh(oxprog, host); + fprintf(stderr, "open (%s)\n", host); + svs[max_process] = sv; + 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; + } + + sv = ox_start_insecure_nonreverse(host, portCtl, portDat); + fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); + return 0; } @@ -73,5 +168,10 @@ int OX_setClientParam(char *h, char* c, char* p) int main(int argc, char *argv[]) { + /* setting the OX parser */ + setflag_parse(PFLAG_ADDREV); + len_svs = 20; + svs = (ox_file_t *)malloc(sizeof(ox_file_t)*len_svs); + MLMain(argc, argv); }