X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=55023e976fdf3106b63928ad8773e2464bae820d;hb=4e1ac996f683092752e957b56ac228b2b9c1a381;hp=64c1906d8639042a3a082d2ce655d6422f3a3abb;hpb=b9093505b17a074e79137ed64595c8269f77d330;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index 64c1906..55023e9 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kinput.c,v $
- * Revision 1.25  1997-09-17 12:19:14  adam
+ * Revision 1.29  1998-06-11 15:41:39  adam
+ * Minor changes.
+ *
+ * Revision 1.28  1998/03/05 08:45:12  adam
+ * New result set model and modular ranking system. Moved towards
+ * descent server API. System information stored as "SGML" records.
+ *
+ * Revision 1.27  1998/02/17 10:32:52  adam
+ * Fixed bug: binary files weren't opened with flag b on NT.
+ *
+ * Revision 1.26  1998/01/29 13:39:13  adam
+ * Compress ISAM is default.
+ *
+ * Revision 1.25  1997/09/17 12:19:14  adam
  * Zebra version corresponds to YAZ version 1.4.
  * Changed Zebra server so that it doesn't depend on global common_resource.
  *
@@ -144,7 +157,7 @@ void getFnameTmp (char *fname, int no)
 
 void key_file_chunk_read (struct key_file *f)
 {
-    int nr = 0, r, fd;
+    int nr = 0, r = 0, fd;
     char fname[1024];
     getFnameTmp (fname, f->no);
     fd = open (fname, O_BINARY|O_RDONLY);
@@ -445,7 +458,7 @@ int heap_inpc (struct heap_info *hi)
         char *dict_info;
 
         strcpy (this_name, hci.cur_name);
-        logf (LOG_DEBUG, "inserting %s", 1+hci.cur_name);
+	assert (hci.cur_name[1]);
         no_diffs++;
         if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
         {
@@ -518,7 +531,6 @@ int heap_inp (struct heap_info *hi)
         if ((info = dict_lookup (hi->dict, cur_name)))
         {
             ISAM_P isam_p, isam_p2;
-            logf (LOG_DEBUG, "updating %s", 1+cur_name);
             memcpy (&isam_p, info+1, sizeof(ISAM_P));
             isam_p2 = is_merge (hi->isam, isam_p, nmemb, key_buf);
             if (!isam_p2)
@@ -537,7 +549,6 @@ int heap_inp (struct heap_info *hi)
         else
         {
             ISAM_P isam_p;
-            logf (LOG_DEBUG, "inserting %s", 1+cur_name);
             no_insertions++;
             isam_p = is_merge (hi->isam, 0, nmemb, key_buf);
             dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p);
@@ -615,7 +626,7 @@ void key_input (BFiles bfs, int nkeys, int cache)
         logf (LOG_FATAL, "dict_open fail");
         exit (1);
     }
-    if (res_get_match (common_resource, "isam", "c", NULL))
+    if (!res_get_match (common_resource, "isam", "i", NULL))
     {
         isamc = isc_open (bfs,
 			  FNAME_ISAMC, 1, key_isamc_m (common_resource));