X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=kernel%2Fmain.c;h=a8fadfb14a7342923b5d0bd0d683f3fab5bd786d;hb=d519fdaae5ce6533cfaa65d0e9715b2bc1c8ae46;hp=e6d00818c1817edbf5e2f567eee28afcd7c4cf0d;hpb=27f77c83ecdd2452bc6756bfdc6b9ebc9703298a;p=egate.git

diff --git a/kernel/main.c b/kernel/main.c
index e6d0081..a8fadfb 100644
--- 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.14  1995/03/28 11:42:34  adam
+ * Revision 1.17  1995/04/19 10:46:18  adam
+ * Persistency works much better now. New command: status - history-like
+ *
+ * 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
@@ -79,7 +88,10 @@ static void kernel_events (struct str_queue *queue, int userid)
     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);
@@ -93,7 +105,7 @@ static void kernel_events (struct str_queue *queue, 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");
@@ -105,7 +117,10 @@ static void kernel_events (struct str_queue *queue, 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))
@@ -125,7 +140,11 @@ static void kernel_events (struct str_queue *queue, int userid)
 	        gw_log (GW_LOG_DEBUG, KERNEL_LOG, "Incoming mail...\n");
                 while (lgets (line_buf, sizeof(line_buf)-1, gip_fd))
                     str_queue_enq (queue, line_buf);
-                urp (queue);
+		urp_start (continuation, queue);
+                if (!continuation)
+		    load_p_state (userid);	
+		urp_command (queue);
+		urp_end ();
                 while (str_queue_deq (queue, 0, 0))
                     ;
 	    }
@@ -138,6 +157,7 @@ static void kernel_events (struct str_queue *queue, int userid)
 	    {
                 gw_log (GW_LOG_WARN, KERNEL_LOG, "Unknown IPC: %s", command);
 	    }
+	    continuation = 1;
 	}
     }
     gips_close (gip);
@@ -162,6 +182,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
@@ -182,14 +203,17 @@ 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':
+                gw_log_level (GW_LOG_ALL & ~RES_DEBUG);
+                break;
+            case 'D':
                 gw_log_level (GW_LOG_ALL);
                 break;
             case 't':
@@ -206,7 +230,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)
@@ -262,7 +286,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)
@@ -298,25 +322,34 @@ 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 (queue);
+	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,
+                                  const char *search_str)
 {
     struct gw_user_set *s;
 
@@ -325,6 +358,10 @@ 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->search_str = gw_strdup (search_str);
     s->prev = info.sets;
     info.sets = s;
     return s;
@@ -337,6 +374,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);
     }
@@ -498,6 +537,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)
     {