X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=www%2Fwsh.c;h=f15ae8790cf63bf70c91b1575637ce0271c93000;hb=ce3ef5c24347417e973e9e6739466dfc701fe19d;hp=990d141120803af48f27ed9841e2e9e3d9d73ef0;hpb=5414eafed41a60ef3625cfc6770184b36016186e;p=egate.git

diff --git a/www/wsh.c b/www/wsh.c
index 990d141..f15ae87 100644
--- a/www/wsh.c
+++ b/www/wsh.c
@@ -41,7 +41,28 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wsh.c,v $
- * Revision 1.3  1995/10/23 16:55:41  adam
+ * Revision 1.8  1995/12/20 16:31:33  adam
+ * Bug fix: shell might terminate even though new request was initiated
+ * by the cgi interface program.
+ * Work on more simple user interface and Europagate buttons.
+ *
+ * Revision 1.7  1995/11/06  17:44:23  adam
+ * State reestablised when shell restarts. History of previous
+ * result sets.
+ *
+ * Revision 1.6  1995/11/06  10:51:19  adam
+ * End of response marker in response from wsh/wproto to wcgi.
+ * Shells are respawned when necessary.
+ *
+ * Revision 1.5  1995/11/01  16:15:48  adam
+ * Better presentation of records. Query/set number persistent.
+ *
+ * Revision 1.4  1995/10/27  15:12:12  adam
+ * IrTcl incorporated in the gateway.
+ * Better separation of script types.
+ * Z39.50 gateway scripts entered.
+ *
+ * Revision 1.3  1995/10/23  16:55:41  adam
  * A lot of changes - really.
  *
  * Revision 1.2  1995/10/20  14:02:42  adam
@@ -59,11 +80,12 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "winterp.h"
+#include <gw-db.h>
+#include "whtml.h"
+#include "wtcl.h"
+#include "wirtcl.h"
 
-#define TIMEOUT_SHORT 60
-#define TIMEOUT_MEDIUM 1800
-#define TIMEOUT_LONG 7200
+#define TIMEOUT 60
 
 static WCLIENT wcl;
 static char *mod = "wsh";
@@ -71,8 +93,9 @@ static char *mod = "wsh";
 int main (int argc, char **argv)
 {
     char *script, *parms, parms_buf[512];
-    int timeout = TIMEOUT_SHORT;
+    int timeout;
     W_Interp w_interp;
+    GW_DB gw_db;
 
     chdir("/usr/local/etc/httpd/cgi-bin");
     gw_log_init (*argv);
@@ -88,6 +111,8 @@ int main (int argc, char **argv)
     gw_log_session (wcl->id);
     if (!strcmp (*argv, "egwtcl"))
         w_interp = w_interp_create (w_interp_tcl, wcl, NULL);
+    else if (!strcmp (*argv, "egwirtcl"))
+        w_interp = w_interp_create (w_interp_irtcl, wcl, NULL);
     else if (!strcmp (*argv, "egwhtml"))
         w_interp = w_interp_create (w_interp_html, wcl, NULL);
     else
@@ -96,18 +121,34 @@ int main (int argc, char **argv)
 	        *argv);
         exit (1);
     }
-    while (wproto_process(wcl, timeout) > 0)
+    w_interp_load_state (w_interp, NULL);
+    timeout = TIMEOUT;
+    while (1)
     {
+        char *p;
+        int r;
+
+        r = wproto_process (wcl, timeout);
+        if (r <= 0)
+        {
+            gw_db = gw_db_open ("www.db", 0, 0);
+            if (gw_db)
+                break;
+            gw_log (GW_LOG_DEBUG, mod, "Cannot terminate - new request");
+            timeout = 10;
+            continue;
+        }
+        timeout = TIMEOUT;
     	wo_clear (wcl, "text/html");
 	strcpy (parms_buf, wcl->wf_parms);
     	script = parms = parms_buf;
     	while (*parms && *parms != '/')
 	    parms++;
-	if (*parms == '/')
+	if (*parms)
 	    *parms++ = '\0';
         if (*script)
         {
-            char *p = script + strlen(script) - 1;
+            p = script + strlen(script) - 1;
             while (*p && p != script)
                 switch (*p)
                 {
@@ -131,6 +172,9 @@ int main (int argc, char **argv)
                     --p;
                 }
         }
+        for (p = parms; *p; p++)
+            if (*p == '+')
+                *p = ' ';
 	gw_log (GW_LOG_DEBUG, mod, "script: %s", script);
 	gw_log (GW_LOG_DEBUG, mod, "parms: %s", parms);
         if (w_interp_exec (w_interp, script, parms))
@@ -141,6 +185,7 @@ int main (int argc, char **argv)
         }
 	wo_finish(wcl);
     }
+    w_interp_save_state (w_interp, NULL);
     wproto_terminate(wcl);
     return 0;
 }