X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tclmain.c;h=bf27a749318785c1df0a787f6a65a1488b741576;hb=e461bc647761fc0284d4556f526c93c8a00a22fa;hp=33a34078a1f5a9a957bdc8d2fae36399f1609f1d;hpb=ed6b88adb8132f4668c60113532d5c2da34523e7;p=ir-tcl-moved-to-github.git diff --git a/tclmain.c b/tclmain.c index 33a3407..bf27a74 100644 --- a/tclmain.c +++ b/tclmain.c @@ -5,7 +5,53 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: tclmain.c,v $ - * Revision 1.6 1995-05-29 08:44:28 adam + * Revision 1.18 1996-02-23 17:31:42 adam + * More functions made available to the wais tcl extension. + * + * Revision 1.17 1996/02/21 10:16:21 adam + * Simplified select handling. Only one function ir_tcl_select_set has + * to be externally defined. + * + * Revision 1.16 1996/02/05 17:58:05 adam + * Ported ir-tcl to use the beta releases of tcl7.5/tk4.1. + * + * Revision 1.15 1996/01/10 09:18:45 adam + * PDU specific callbacks implemented: initRespnse, searchResponse, + * presentResponse and scanResponse. + * Bug fix in the command line shell (tclmain.c) - discovered on OSF/1. + * + * Revision 1.14 1995/09/21 13:11:53 adam + * Support of dynamic loading. + * Test script uses load command if necessary. + * + * Revision 1.13 1995/08/28 12:21:22 adam + * Removed lines and list as synonyms of list in MARC extractron. + * Configure searches also for tk4.0 / tcl7.4. + * + * Revision 1.12 1995/08/28 11:07:16 adam + * Minor changes. + * + * Revision 1.11 1995/08/03 13:23:02 adam + * Request queue. + * + * Revision 1.10 1995/06/30 12:39:28 adam + * Bug fix: loadFile didn't set record type. + * The MARC routines are a little less strict in the interpretation. + * Script display.tcl replaces the old marc.tcl. + * New interactive script: shell.tcl. + * + * Revision 1.9 1995/06/26 10:20:20 adam + * ir-tk works like wish. + * + * Revision 1.8 1995/06/21 15:16:44 adam + * More work on configuration. + * + * Revision 1.7 1995/06/21 11:04:54 adam + * Uses GNU autoconf 2.3. + * Install procedure implemented. + * boook bitmaps moved to sub directory bitmaps. + * + * Revision 1.6 1995/05/29 08:44:28 adam * Work on delete of objects. * * Revision 1.5 1995/03/20 08:53:30 adam @@ -16,23 +62,25 @@ * */ +#include #include #include +#ifdef _AIX +#include +#endif #include -#include #include - +#include #include "ir-tcl.h" static char *fileName = NULL; /* select(2) callbacks */ struct callback { - void (*r_handle)(void *p); - void (*w_handle)(void *p); - void (*x_handle)(void *p); - void *obj; + void (*handle)(ClientData, int, int, int); + int r, w, e; + ClientData obj; }; #define MAX_CALLBACK 200 @@ -45,8 +93,12 @@ int Tcl_AppInit (Tcl_Interp *interp) { if (Tcl_Init(interp) == TCL_ERROR) return TCL_ERROR; - if (ir_tcl_init(interp) == TCL_ERROR) + if (Irtcl_Init(interp) == TCL_ERROR) return TCL_ERROR; +#if USE_WAIS + if (Waistcl_Init(interp) == TCL_ERROR) + return TCL_ERROR; +#endif return TCL_OK; } @@ -65,11 +117,7 @@ int main (int argc, char **argv) fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result); } for (i=0; iresult); + } + } + tcl_mainloop (interp, 0); + } exit (0); } @@ -101,7 +172,7 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) if (interactive) { Tcl_DStringInit (&command); - printf ("[TCL]"); fflush (stdout); + printf ("%% "); fflush (stdout); } while (1) { @@ -112,17 +183,17 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) FD_SET (0, &fdset_tcl_r); for (res=0, i=min_fd; i<=max_fd; i++) { - if (callback_table[i].w_handle) + if (callback_table[i].handle && callback_table[i].w) { FD_SET (i, &fdset_tcl_w); res++; } - if (callback_table[i].r_handle) + if (callback_table[i].handle && callback_table[i].r) { FD_SET (i, &fdset_tcl_r); res++; } - if (callback_table[i].x_handle) + if (callback_table[i].handle && callback_table[i].e) { FD_SET (i, &fdset_tcl_x); res++; @@ -140,26 +211,26 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) continue; for (i=min_fd; i<=max_fd; i++) { - if (FD_ISSET (i, &fdset_tcl_r)) - { - assert (callback_table[i].r_handle); - (*callback_table[i].r_handle) (callback_table[i].obj); - } - if (FD_ISSET (i, &fdset_tcl_w)) - { - assert (callback_table[i].w_handle); - (*callback_table[i].w_handle) (callback_table[i].obj); - } - if (FD_ISSET (i, &fdset_tcl_x)) - { - assert (callback_table[i].x_handle); - (*callback_table[i].x_handle) (callback_table[i].obj); - } + int r_flag = 0; + int w_flag = 0; + int e_flag = 0; + + if (!callback_table[i].handle) + continue; + if (FD_ISSET (i, &fdset_tcl_r) && callback_table[i].r) + r_flag = 1; + if (FD_ISSET (i, &fdset_tcl_w) && callback_table[i].w) + w_flag = 1; + if (FD_ISSET (i, &fdset_tcl_x) && callback_table[i].e) + e_flag = 1; + if (r_flag || w_flag || e_flag) + (*callback_table[i].handle)(callback_table[i].obj, + r_flag, w_flag, e_flag); } if (interactive && FD_ISSET(0, &fdset_tcl_r)) { - char input_buf[256]; - int count = read (0, input_buf, 256); + char input_buf[1024]; + int count = read (0, input_buf, 1024); if (count <= 0) exit (0); @@ -169,40 +240,24 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive) int code = Tcl_Eval (interp, Tcl_DStringValue (&command)); Tcl_DStringFree (&command); if (code) - printf ("[ERR:%s]\n", interp->result); - else - printf ("[RES:%s]\n", interp->result); - printf ("[TCL]"); fflush (stdout); + printf ("Error: %s\n", interp->result); + else if (*interp->result) + printf ("%s\n", interp->result); + printf ("%% "); fflush (stdout); } } } } -void ir_select_add (int fd, void *obj) +void ir_tcl_select_set (void (*f)(ClientData clientData, int r, int w, int e), + int fd, ClientData clientData, int r, int w, int e) { - callback_table[fd].obj = obj; - callback_table[fd].r_handle = ir_select_read; - callback_table[fd].w_handle = NULL; - callback_table[fd].x_handle = NULL; + callback_table[fd].handle = f; + callback_table[fd].obj = clientData; + callback_table[fd].r = r; + callback_table[fd].w = w; + callback_table[fd].e = e; if (fd > max_fd) max_fd = fd; } -void ir_select_add_write (int fd, void *obj) -{ - callback_table[fd].w_handle = ir_select_write; - if (fd > max_fd) - max_fd = fd; -} - -void ir_select_remove_write (int fd, void *obj) -{ - callback_table[fd].w_handle = NULL; -} - -void ir_select_remove (int fd, void *obj) -{ - callback_table[fd].r_handle = NULL; - callback_table[fd].w_handle = NULL; - callback_table[fd].x_handle = NULL; -}