X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fmain.c;h=7926912f99a650645f45eaf21359a3303928f2e0;hb=68ab7e062ced1b3d335ab6432840a393b6627a27;hp=9398e2b22293a1d0e4e836821869d2c56db75fbd;hpb=7d911b772d7116575f2537b48005ad873fde4473;p=egate.git

diff --git a/kernel/main.c b/kernel/main.c
index 9398e2b..7926912 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -2,7 +2,16 @@
  * Europagate, 1995
  *
  * $Log: main.c,v $
- * Revision 1.15  1995/04/17 09:34:30  adam
+ * Revision 1.18  1995/04/19 13:19:09  adam
+ * New command: account - for authentication.
+ *
+ * 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
@@ -113,6 +122,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 +144,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))
@@ -165,6 +178,7 @@ int main (int argc, char **argv)
     info.default_res = "default.res";
     info.override_res = NULL;
     *info.target = 0;
+    *info.account = 0;
     info.lang = NULL;
     info.bibset = NULL;
     info.zass = NULL;
@@ -172,6 +186,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
@@ -200,6 +215,9 @@ int main (int argc, char **argv)
                 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':
@@ -308,17 +326,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 +349,11 @@ 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,
+                                  const char *search_str)
 {
     struct gw_user_set *s;
 
@@ -337,6 +362,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;
@@ -349,6 +378,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);
     }
@@ -460,16 +491,20 @@ void read_kernel_res (void)
     if (*info.target && ! gw_res_get (info.kernel_res, resource_name, NULL))
     {
         /* target is there, and there is no sub-resource for it... */
-        char *split;
+        const char *split;
 
         if ((split = strchr (info.target, ':')))
-            *split++ = '\0';
-        strncpy (info.hostname, info.target, sizeof(info.hostname)-1);
-        if (split)
-            info.port = atoi (split);
+        {
+            memcpy (info.hostname, info.target, split-info.target);
+            info.hostname[split-info.target] = '\0';
+            info.port = atoi (split+1);
+        }
         else
+        {
+            strcpy (info.hostname, info.target);
             info.port = atoi (gw_res_get
                               (info.kernel_res, "gw.portno", "210"));
+        }
     }
     else
     {
@@ -510,6 +545,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)
     {