* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wtcl.c,v $
- * Revision 1.3 1995/10/27 15:12:14 adam
+ * 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.
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;
char *fbuf;
int fbuf_size;
int fbuf_ptr;
+ int wabort;
WCLIENT wcl;
};
return p->interp;
}
-static int proc_html_invoke (ClientData clientData, Tcl_Interp *interp,
- int argc, char **argv)
+static int proc_wabort_invoke (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
{
struct tcl_info *p = (struct tcl_info*) clientData;
- int i;
- for (i = 1; i<argc; i++)
- wo_puts (p->wcl, argv[i]);
- return TCL_OK;
+ p->wabort = 1;
+ if (argc > 1)
+ Tcl_AppendResult (interp, argv[1], NULL);
+ return TCL_RETURN;
}
-static int proc_htmlr_invoke (ClientData clientData, Tcl_Interp *interp,
- int argc, char **argv)
+static int proc_wflush_invoke (ClientData clientData, Tcl_Interp *interp,
+ int argc, char **argv)
{
struct tcl_info *p = (struct tcl_info*) clientData;
- int r;
- r = proc_html_invoke (clientData, interp, argc, argv);
- wo_putc (p->wcl, '\n');
- return r;
+ wo_flush (p->wcl);
+ return TCL_OK;
}
-static int proc_form_invoke (ClientData clientData, Tcl_Interp *interp,
+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; i<argc; i++)
+ wo_write (p->wcl, 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)
{
- Tcl_AppendResult (p->interp, wgetval (p->wcl, argv[1]), NULL);
+ 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++)
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;
+}
+
+
int Tcl_AppInit (Tcl_Interp *interp)
{
if (Tcl_Init (interp) == TCL_ERROR)
}
Tcl_AppInit (p->interp);
Tcl_CreateCommand (p->interp, "html", proc_html_invoke, p, NULL);
- Tcl_CreateCommand (p->interp, "htmlr", proc_htmlr_invoke, p, NULL);
- Tcl_CreateCommand (p->interp, "form", proc_form_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);
sprintf (tmp_str, "%d", wcl->id);
Tcl_SetVar (p->interp, "sessionId", tmp_str, TCL_GLOBAL_ONLY);
return p;
static void report_error (struct tcl_info *p, int errorLine,
const char *pre, const char *msg)
{
- gw_log (GW_LOG_WARN, "%s %d\%s", pre, errorLine, msg);
+ if (!msg)
+ msg = "";
+ gw_log (GW_LOG_WARN, mod, "%s %d %s", pre, errorLine, msg);
wo_printf (p->wcl, "\n<br><hr>\n<strong>"
"%s %d</strong><br>\n", pre, errorLine);
wo_printf (p->wcl, "<xmp>\n%s</xmp>\n<hr>\n", msg);
{
report_error (p, *lineno, "Error in Tcl script starting at line",
"Unexpected EOF (missing right brace)");
- return -1;
+ return TCL_ERROR;
}
if (c == '\\')
escape = 1;
p->fbuf[fbuf_ptr++] = c;
}
p->fbuf[fbuf_ptr] = '\0';
+ p->wabort = 0;
r = Tcl_Eval (p->interp, p->fbuf);
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 (const char *fname, char *parms, void *mydata)
wo_putc (p->wcl, c);
else
{
- if (tcl_exec (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;
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;
+}
+
projects / egate.git / blobdiff