First work on Z39.50 persistence.

[egate.git] / kernel / main.c

diff --git a/kernel/main.c b/kernel/main.c
index fd6ef7e..f638c4b 100644 (file)
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -1,8 +1,17 @@
-/* Gateway kernel
+/* Gateway kernel - Main
  * Europagate, 1995
  *
  * $Log: main.c,v $
- * Revision 1.13  1995/03/28 08:01:25  adam
+ * Revision 1.16  1995/04/19 07:31:07  adam
+ * First work on Z39.50 persistence.
+ *
+ * Revision 1.15  1995/04/17  09:34:30  adam
+ * Timeout (idletime) adjustable. Minor changes in kernel.
+ *
+ * Revision 1.14  1995/03/28  11:42:34  adam
+ * First use of string-queue utility.
+ *
+ * Revision 1.13  1995/03/28  08:01:25  adam
  * FIFO existence is used to test for a running kernel.
  *
  * Revision 1.12  1995/03/27  12:51:05  adam
@@ -60,21 +69,26 @@
 #include <fcntl.h>
 
 #include <gip.h>
+#include <strqueue.h>
 #include "kernel.h"
 
 FILE *reply_fd = stdout;
 
 struct gw_kernel_info info;
 
-static void kernel_events (int userid)
+static void kernel_events (struct str_queue *queue, int userid)
 {
     char fifo_client_name[1024];
     char fifo_server_name[1024];
+    char line_buf[1024];
     GIP gip;
     fd_set set_r;
     int r, gip_fd;
     struct timeval tv;
+    int timeout;
+    int continuation = 0;
 
+    timeout = atoi(gw_res_get (info.kernel_res, "gw.timeout", "600"));
     gw_log (GW_LOG_DEBUG, KERNEL_LOG, "kernel event loop");
 
     sprintf (fifo_client_name, "fifo.c.%d", userid);
@@ -88,7 +102,7 @@ static void kernel_events (int userid)
     {
         FD_ZERO (&set_r);
        FD_SET (gip_fd, &set_r);
-        tv.tv_sec = 60;
+        tv.tv_sec = timeout;
        tv.tv_usec = 0;
 
        gw_log (GW_LOG_DEBUG, KERNEL_LOG, "IPC select");
@@ -100,7 +114,10 @@ static void kernel_events (int userid)
        }
        if (r == 0)
        {
-           gw_log (GW_LOG_STAT, KERNEL_LOG, "Timeout");
+           gw_log (GW_LOG_STAT, KERNEL_LOG, "Timeout after %d seconds", 
+                   timeout);
+           if (info.zass)
+               save_p_state (userid);
            break;
        }
        if (FD_ISSET (gip_fd, &set_r))
@@ -118,7 +135,15 @@ static void kernel_events (int userid)
             if (!strcmp (command, "mail"))
            {
                gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Incoming mail...\n");
-                urp (gip_fd);
+                while (lgets (line_buf, sizeof(line_buf)-1, gip_fd))
+                    str_queue_enq (queue, line_buf);
+               urp_start (continuation, queue);
+                if (!continuation)
+                   load_p_state (userid);      
+               urp_command (queue);
+               urp_end ();
+                while (str_queue_deq (queue, 0, 0))
+                    ;
            }
            else if (!strcmp (command, "stop"))
            {
@@ -129,6 +154,7 @@ static void kernel_events (int userid)
            {
                 gw_log (GW_LOG_WARN, KERNEL_LOG, "Unknown IPC: %s", command);
            }
+           continuation = 1;
        }
     }
     gips_close (gip);
@@ -140,6 +166,7 @@ static void kernel_events (int userid)
 int main (int argc, char **argv)
 {
     int userid = -1;
+    struct str_queue *queue;
 
     info.kernel_res = NULL;
     info.default_res = "default.res";
@@ -152,6 +179,7 @@ int main (int argc, char **argv)
     info.override_hostname = NULL;
     info.databases = NULL;
     info.database = NULL;
+    info.setno = -1;
 #if USE_FML
     info.fml = NULL;
 #endif
@@ -172,11 +200,11 @@ int main (int argc, char **argv)
                 fprintf (stderr, "Options:\n");
                 fprintf (stderr, " -d           Enable debugging log\n");
                 fprintf (stderr, " -t target    Open target immediately\n");
-                fprintf (stderr, " -l lang      Set language\n");
+                fprintf (stderr, " -g lang      Set language\n");
                 fprintf (stderr, " -o resource  Override with resource\n");
                 fprintf (stderr, " -h host      Override host\n");
                 fprintf (stderr, " -p port      Override port\n");
-                fprintf (stderr, " -g log       Set Log file\n");
+                fprintf (stderr, " -l log       Set Log file\n");
                 fprintf (stderr, " -i id        Set IPC userid\n");
                 exit (1);
             case 'd':
@@ -196,7 +224,7 @@ int main (int argc, char **argv)
                     exit (1);
                 }
                 break;
-            case 'l':
+            case 'g':
                 if (argv[0][2])
                     info.lang = argv[0]+2;
                 else if (argc > 0)
@@ -252,7 +280,7 @@ int main (int argc, char **argv)
                     exit (1);
                 }
                 break;
-            case 'g':
+            case 'l':
                 if (argv[0][2])
                     gw_log_file (GW_LOG_ALL, argv[0]+2);
                 else if (argc > 0)
@@ -288,15 +316,33 @@ int main (int argc, char **argv)
         else
             info.default_res = *argv;
     }
-    read_kernel_res ();
+    if (!(queue = str_queue_mk ()))
+    {
+        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, KERNEL_LOG, "str_queue_mk");
+        exit (1);
+    }
     if (userid != -1)
-        kernel_events (userid);
+    {
+       read_kernel_res ();
+        kernel_events (queue, userid);
+    }
     else
-        urp (0);
+    {
+        char line_buf[512];
+        read_kernel_res ();
+        while (lgets (line_buf, sizeof(line_buf)-1, 0))
+            str_queue_enq (queue, line_buf);
+       urp_start (0, queue);
+       urp_command (queue);
+       urp_end ();
+    }
     return 0;
 }
 
-struct gw_user_set *user_set_add (const char *name, int hits)
+struct gw_user_set *user_set_add (const char *name, int hits, 
+                                 const char *database, 
+                                 struct ccl_rpn_node *rpn,
+                                 int present_flag)
 {
     struct gw_user_set *s;
 
@@ -305,6 +351,9 @@ struct gw_user_set *user_set_add (const char *name, int hits)
 
     s->name = gw_strdup (name);
     s->hits = hits;
+    s->database = gw_strdup (database);
+    s->rpn = rpn;
+    s->present_flag = present_flag;
     s->prev = info.sets;
     info.sets = s;
     return s;
@@ -317,6 +366,8 @@ void user_set_init (void)
     for (s = info.sets; s; s = s1)
     {
         free (s->name);
+       free (s->database);
+       ccl_rpn_delete (s->rpn);
         s1 = s->prev;
         free (s);
     }
@@ -478,6 +529,8 @@ void read_kernel_res (void)
     if (info.override_hostname)
         strncpy (info.hostname, info.override_hostname,
                  sizeof(info.hostname)-1);
+    v = gw_res_get (info.kernel_res, "gw.result.set", NULL);
+    info.setno = v ? -1 : 0;
 #if USE_FML
     if (!info.fml)
     {