X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fwtcl.c;h=542c67d189201fe3b7ea3cc34dea84142cfee8b1;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=ebdabb5681981de52310bc15a71b5fd0b20400d3;hpb=f37ddd57014f51c88ef36050ed08b4c6e226e094;p=egate.git diff --git a/www/wtcl.c b/www/wtcl.c index ebdabb5..542c67d 100644 --- a/www/wtcl.c +++ b/www/wtcl.c @@ -41,7 +41,48 @@ * USE OR PERFORMANCE OF THIS SOFTWARE. * * $Log: wtcl.c,v $ - * Revision 1.1 1995/10/20 14:02:42 adam + * Revision 1.12 1996/03/07 12:45:34 adam + * New Tcl calls egw_enc/egw_dec to encode/decode binary URL info. + * + * Revision 1.11 1996/01/24 08:26:56 adam + * All tcl commands prefixed with egw_ (except the html command). + * + * Revision 1.10 1995/11/08 16:14:35 adam + * Many improvements and bug fixes. + * First version that ran on dtbsun. + * + * Revision 1.9 1995/11/07 14:57:00 adam + * Work on search in multiple targets. + * New wtcl command: wlog. + * Optional timeout parameter to zwait. + * + * Revision 1.8 1995/11/06 17:44:23 adam + * State reestablised when shell restarts. History of previous + * result sets. + * + * Revision 1.7 1995/10/31 16:56:25 adam + * Record presentation. + * + * Revision 1.6 1995/10/31 10:03:54 adam + * Work on queries. + * New command implemented - aborts script. + * + * Revision 1.5 1995/10/30 17:35:18 adam + * New function zwait that waits for a variable change - due to i/o events + * that invoke callback routines. + * + * Revision 1.4 1995/10/27 17:30:16 adam + * First search request/response that works. + * + * Revision 1.3 1995/10/27 15:12:14 adam + * IrTcl incorporated in the gateway. + * Better separation of script types. + * Z39.50 gateway scripts entered. + * + * Revision 1.2 1995/10/23 16:55:43 adam + * A lot of changes - really. + * + * Revision 1.1 1995/10/20 14:02:42 adam * First version of WWW gateway with embedded Tcl. * */ @@ -52,18 +93,19 @@ #include #include -#include - -#include "wproto.h" -#include "winterp.h" +#include "wtcl.h" -static void *do_create (void *args); -static int do_exec (WCLIENT wcl, const char *fname, char *parms, void *mydata); +static void *do_create (WCLIENT wcl, void *args); +static int do_exec (const char *fname, char *parms, void *mydata); +static int do_load (char *parms, void *mydata); +static int do_save (char *parms, void *mydata); static struct w_interp_type w_interp_t = { "tcl", do_create, - do_exec + do_exec, + do_load, + do_save }; W_Interp_Type w_interp_tcl = &w_interp_t; @@ -76,12 +118,192 @@ struct tcl_info { char *fbuf; int fbuf_size; int fbuf_ptr; + int wabort; + WCLIENT wcl; }; -static void *do_create (void *args) +Tcl_Interp *w_interp_tcl_get (W_Interp w_interp) { struct tcl_info *p; + if (strcmp (w_interp->ctrl->name, "tcl")) + { + gw_log (GW_LOG_FATAL, mod, "Internal failure"); + assert (0); + } + p = (struct tcl_info*) w_interp->mydata; + return p->interp; +} + +static int proc_wabort_invoke (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + struct tcl_info *p = (struct tcl_info*) clientData; + + p->wabort = 1; + if (argc > 1) + Tcl_AppendResult (interp, argv[1], NULL); + return TCL_RETURN; +} + +static int proc_wflush_invoke (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + struct tcl_info *p = (struct tcl_info*) clientData; + + wo_flush (p->wcl); + return TCL_OK; +} + +static int proc_html_invoke (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + struct tcl_info *p = (struct tcl_info*) clientData; + int i; + + for (i = 1; iwcl, argv[i], strlen(argv[i])); + return TCL_OK; +} + +static int proc_wform_invoke (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + struct tcl_info *p = (struct tcl_info*) clientData; + int i; + if (argc == 2) + { + for (i = 0; *p->wcl->wf_data[i].name; i++) + if (!strcmp (argv[1], p->wcl->wf_data[i].name) && + *p->wcl->wf_data[i].value) + Tcl_AppendElement (p->interp, p->wcl->wf_data[i].value); + return TCL_OK; + } + for (i = 0; *p->wcl->wf_data[i].name; i++) + { + Tcl_AppendResult (p->interp, "{ ", NULL); + Tcl_AppendElement (p->interp, p->wcl->wf_data[i].name); + Tcl_AppendElement (p->interp, p->wcl->wf_data[i].value); + Tcl_AppendResult (p->interp, " }\n", NULL); + } + return TCL_OK; +} + +static int proc_wlog_invoke (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + unsigned mask; + + if (argc < 3) + return TCL_OK; + if (!strcmp (argv[1], "debug")) + mask = GW_LOG_DEBUG; + else if (!strcmp (argv[1], "fatal")) + mask = GW_LOG_FATAL; + else if (!strcmp (argv[1], "warn")) + mask = GW_LOG_WARN; + else if (!strcmp (argv[1], "acct")) + mask = GW_LOG_ACCT; + else + mask = GW_LOG_DEBUG; + switch (argc) + { + case 3: + gw_log (mask, mod, "%s", argv[2]); + break; + case 4: + gw_log (mask, mod, "%s %s", argv[2], argv[3]); + break; + case 5: + gw_log (mask, mod, "%s %s %s", argv[2], argv[3], argv[4]); + break; + case 6: + gw_log (mask, mod, "%s %s %s %s", argv[2], argv[3], argv[4], argv[5]); + break; + } + return TCL_OK; +} + +static int proc_enc (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + int i; + char buf1[4]; + char buf2[2]; + + buf1[0] = '%'; + buf2[1] = '\0'; + for (i = 1; i= 127 || *cp == '/' || *cp == ' ' || + *cp == '&' || *cp == ':' || *cp == '%') + { + sprintf (buf1+1, "%02X", *cp); + Tcl_AppendResult (interp, buf1, NULL); + } + else + { + buf2[0] = *cp; + Tcl_AppendResult (interp, buf2, NULL); + } + cp++; + } + } + return TCL_OK; +} + +static int proc_dec (ClientData clientData, Tcl_Interp *interp, + int argc, char **argv) +{ + int i; + unsigned val; + char buf[2]; + + buf[1] = '\0'; + for (i = 1; i= 'A') + val = cp[1] - 'A'+10; + else + val = cp[1] - '0'; + + + if (cp[2] >= 'A') + val = val*16 + (cp[2] - 'A'+10); + else + val = val*16 + (cp[2] - '0'); + buf[0] = val; + cp += 3; + } + else + buf[0] = *cp++; + Tcl_AppendResult (interp, buf, NULL); + } + } + return TCL_OK; +} + + +int Tcl_AppInit (Tcl_Interp *interp) +{ + if (Tcl_Init (interp) == TCL_ERROR) + return TCL_ERROR; + return TCL_OK; +} + +static void *do_create (WCLIENT wcl, void *args) +{ + struct tcl_info *p; + char tmp_str[256]; + if (!(p = malloc (sizeof(*p)))) { gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc: tcl_info"); @@ -92,23 +314,44 @@ static void *do_create (void *args) gw_log (GW_LOG_FATAL, mod, "Cannot make Tcl_Interp"); exit (1); } + p->wcl = wcl; p->fbuf_size = 1024; if (!(p->fbuf = malloc (p->fbuf_size))) { gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc: tcl_info fbuf"); exit (1); } + Tcl_AppInit (p->interp); + Tcl_CreateCommand (p->interp, "html", proc_html_invoke, p, NULL); + Tcl_CreateCommand (p->interp, "egw_form", proc_wform_invoke, p, NULL); + Tcl_CreateCommand (p->interp, "egw_abort", proc_wabort_invoke, p, NULL); + Tcl_CreateCommand (p->interp, "egw_flush", proc_wflush_invoke, p, NULL); + Tcl_CreateCommand (p->interp, "egw_log", proc_wlog_invoke, p, NULL); + Tcl_CreateCommand (p->interp, "egw_enc", proc_enc, p, NULL); + Tcl_CreateCommand (p->interp, "egw_dec", proc_dec, p, NULL); + sprintf (tmp_str, "%d", wcl->id); + Tcl_SetVar (p->interp, "sessionId", tmp_str, TCL_GLOBAL_ONLY); return p; } -static int tcl_exec (WCLIENT wcl, const char *fname, char *parms, +static void report_error (struct tcl_info *p, int errorLine, + const char *pre, const char *msg) +{ + if (!msg) + msg = ""; + gw_log (GW_LOG_WARN, mod, "%s %d %s", pre, errorLine, msg); + wo_printf (p->wcl, "\n
\n" + "%s %d
\n", pre, errorLine); + wo_printf (p->wcl, "\n%s\n
\n", msg); +} + +static int tcl_exec (const char *fname, char *parms, struct tcl_info *p, FILE *inf, int *lineno) { int c, escape = 0, level = 0; int r, fbuf_ptr = 0; int local_line = 0; - gw_log (GW_LOG_DEBUG, mod, "tcl_exec. line %d", *lineno); while (1) { if (fbuf_ptr == p->fbuf_size-1) @@ -127,8 +370,9 @@ static int tcl_exec (WCLIENT wcl, const char *fname, char *parms, c = getc (inf); if (c == EOF) { - gw_log (GW_LOG_WARN, mod, "Unexpected EOF: unbalanced braces"); - return -1; + report_error (p, *lineno, "Error in Tcl script starting at line", + "Unexpected EOF (missing right brace)"); + return TCL_ERROR; } if (c == '\\') escape = 1; @@ -152,19 +396,19 @@ static int tcl_exec (WCLIENT wcl, const char *fname, char *parms, p->fbuf[fbuf_ptr++] = c; } p->fbuf[fbuf_ptr] = '\0'; - gw_log (GW_LOG_DEBUG, mod, "Tcl_Eval. %d lines", local_line); + p->wabort = 0; r = Tcl_Eval (p->interp, p->fbuf); - if (r != TCL_OK) - { - gw_log (GW_LOG_WARN, mod, "Error in Tcl script starting on line %d", - *lineno); - } + if (r == TCL_ERROR) + report_error (p, p->interp->errorLine + *lineno - 1, + "Error in Tcl script in line", + Tcl_GetVar (p->interp, "errorInfo", 0)); (*lineno) += local_line; - return 0; + if (p->wabort) + return TCL_RETURN; + return r; } -static int do_exec (WCLIENT wcl, const char *fname, char *parms, - void *mydata) +static int do_exec (const char *fname, char *parms, void *mydata) { struct tcl_info *p = mydata; int c, escape = 0; @@ -177,6 +421,7 @@ static int do_exec (WCLIENT wcl, const char *fname, char *parms, gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "open %s", fname); return -1; } + Tcl_SetVar (p->interp, "sessionParms", parms, TCL_GLOBAL_ONLY); while ((c = getc(inf)) != EOF) { if (c == '\\') @@ -184,10 +429,16 @@ static int do_exec (WCLIENT wcl, const char *fname, char *parms, else if (c == '{') { if (escape) - wo_putc (wcl, c); + wo_putc (p->wcl, c); else { - if (tcl_exec (wcl, fname, parms, p, inf, &lineno)) + int r = tcl_exec (fname, parms, p, inf, &lineno); + if (r == TCL_RETURN) + { + fclose (inf); + return 0; + } + else if (r == TCL_ERROR) { fclose (inf); return -2; @@ -200,9 +451,43 @@ static int do_exec (WCLIENT wcl, const char *fname, char *parms, if (c == '\n') lineno++; escape = 0; - wo_putc (wcl, c); + wo_putc (p->wcl, c); } } fclose (inf); return 0; } + + +static int do_load (char *parms, void *mydata) +{ + struct tcl_info *p = mydata; + char fname[80]; + int r; + + sprintf (fname, "tcl.state.%d", p->wcl->id); + r = Tcl_EvalFile (p->interp, fname); + if (r == TCL_ERROR) + gw_log (GW_LOG_WARN, mod, "Cannot load Tcl state" ); + return 0; +} + +static int do_save (char *parms, void *mydata) +{ + struct tcl_info *p = mydata; + struct Tcl_CmdInfo cinfo; + + if (Tcl_GetCommandInfo(p->interp, "saveState", &cinfo)) + { + int r; + + gw_log (GW_LOG_DEBUG, mod, "saveState"); + r = Tcl_Eval (p->interp, "saveState\n"); + if (r == TCL_ERROR) + report_error (p, p->interp->errorLine, + "Error in Tcl saveState in line", + Tcl_GetVar (p->interp, "errorInfo", 0)); + } + return 0; +} +