Run latex

[egate.git] / www / wirtcl.c

diff --git a/www/wirtcl.c b/www/wirtcl.c
index 6425be9..0179c18 100644 (file)
--- a/www/wirtcl.c
+++ b/www/wirtcl.c
@@ -41,7 +41,14 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wirtcl.c,v $
- * Revision 1.16  1996/02/29 15:40:23  adam
+ * Revision 1.18  2001/02/26 10:35:40  adam
+ * Updated for version YAZ 1.6 and higher.
+ *
+ * Revision 1.17  1996/03/15 14:43:26  adam
+ * Function egw_wait returns 'cancel' if new request is pending (user
+ * has cancelled); or egw_wait returns 'timeout' on timeout.
+ *
+ * Revision 1.16  1996/02/29  15:40:23  adam
  * New function w_interp_irtcl_get that returns Tcl interpreter of
  * IrTcl interpreter.
  *
@@ -113,7 +120,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include "wtcl.h"
 #include "wirtcl.h"
 
@@ -186,7 +193,7 @@ static void *do_create (WCLIENT wcl, void *args)
         gw_log (GW_LOG_FATAL, mod, "Cannot make Irtcl_Interp");
         exit (1);
     }
-    log_init(LOG_ALL, "irtcl", "irtcl_log");
+    yaz_log_init(LOG_ALL, "irtcl", "irtcl_log");
     /* initialize irtcl */
     Tcl_CreateCommand (p->interp, "egw_wait", proc_zwait_invoke, p, NULL);
     for (i=0; i<MAX_CALLBACK; i++)
@@ -290,12 +297,14 @@ static int events (struct tcl_info *p, char *waitVar, int tout)
         if (!r)
         {
             gw_log (GW_LOG_DEBUG, mod, "timeout");
+            p->interp->result = "timeout";
             free (waitVarVal);
             return TCL_ERROR;
         }
         if (FD_ISSET (fifo_in, &fdset_tcl_r))
         {
             gw_log (GW_LOG_DEBUG, mod, "FIFO closed");
+            p->interp->result = "cancel";
             free (waitVarVal);
             return TCL_ERROR;
         }