=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v retrieving revision 1.14 retrieving revision 1.24 diff -u -p -r1.14 -r1.24 --- OpenXM/src/ox_math/math2ox.c 2000/03/10 12:38:46 1.14 +++ OpenXM/src/ox_math/math2ox.c 2005/07/26 12:52:04 1.24 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.13 2000/02/14 09:39:12 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.23 2005/07/20 17:48:03 ohara Exp $ */ /* Copyright (C) Katsuyoshi OHARA, 2000. @@ -21,13 +21,12 @@ #include #include #include -#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; @@ -37,13 +36,10 @@ void OX_get(int id) { cmo *c = NULL; - receive_ox_tag(ss[id]->stream); - c = receive_cmo(ss[id]->stream); -#ifdef DEBUG - fprintf(stderr, "ox message is received in OxGet[].\n"); + receive_ox_tag(ss[id]); + c = receive_cmo(ss[id]); + ox_printf("ox message is received in OxGet[].\n"); print_cmo(c); - fflush(stderr); -#endif send_mlo(c); ml_flush(); } @@ -78,21 +74,20 @@ 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) { - cmo *m; - int len = strlen(s); - init_parser(s); + return OX_sendMessage(id, s); +} - if(s != NULL && len > 0 && (m = parse()) != NULL) { - if (m->tag == OX_DATA) { - send_ox_cmo(ss[id]->stream, ((ox_data *)m)->cmo); - }else if (m->tag == OX_COMMAND) { - send_ox_command(ss[id]->stream, ((ox_command *)m)->command); - }else { - send_ox_cmo(ss[id]->stream, m); - } +/* 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 = ox_parse_lisp(s); + if(m != NULL) { + send_ox(ss[id], m); return 0; } return -1; /* if we failed. */ @@ -105,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; @@ -121,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; @@ -140,8 +135,8 @@ 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); - fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); + ss[max_process] = ox_start_insecure(host, portCtl, portDat); + ox_printf("math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); return max_process; } @@ -163,28 +158,31 @@ 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 "2000/11/29" + 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, "math2ox"); MLMain(argc, argv); }