First work on Z39.50 persistence.

[egate.git] / kernel / main.c

diff --git a/kernel/main.c b/kernel/main.c
index 9398e2b..f638c4b 100644 (file)
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -2,7 +2,10 @@
  * Europagate, 1995
  *
  * $Log: main.c,v $
- * Revision 1.15  1995/04/17 09:34:30  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
@@ -113,6 +116,8 @@ static void kernel_events (struct str_queue *queue, int userid)
        {
            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))
@@ -133,6 +138,8 @@ static void kernel_events (struct str_queue *queue, int userid)
                 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))
@@ -172,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
@@ -308,17 +316,20 @@ 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)
+    {
+       read_kernel_res ();
         kernel_events (queue, userid);
+    }
     else
     {
         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);
@@ -328,7 +339,10 @@ int main (int argc, char **argv)
     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;
 
@@ -337,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;
@@ -349,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);
     }
@@ -510,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)
     {