Updated WIN32 code specific sections. Changed header.

[idzebra-moved-to-github.git] / index / kinput.c

diff --git a/index/kinput.c b/index/kinput.c
index 4da9460..9053738 100644 (file)
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,10 +1,33 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kinput.c,v $
- * Revision 1.24  1997-09-09 13:38:07  adam
+ * Revision 1.31  1999-02-02 14:50:56  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.30  1998/10/28 10:53:57  adam
+ * Added type cast to prevent warning.
+ *
+ * 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.
+ *
+ * Revision 1.24  1997/09/09 13:38:07  adam
  * Partial port to WIN95/NT.
  *
  * Revision 1.23  1997/09/04 13:57:39  adam
@@ -91,7 +114,7 @@
  */
 
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -140,7 +163,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);
@@ -441,7 +464,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)))
         {
@@ -498,7 +521,7 @@ int heap_inp (struct heap_info *hi)
                 break;
             memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE);
             key_buf_ptr += KEY_SIZE;
-            if (key_buf_ptr+KEY_SIZE >= key_buf_size)
+            if (key_buf_ptr+(int) KEY_SIZE >= key_buf_size)
             {
                 char *new_key_buf;
                 new_key_buf = xmalloc (key_buf_size + INP_BUF_ADD);
@@ -510,11 +533,10 @@ int heap_inp (struct heap_info *hi)
         }
         no_diffs++;
         nmemb = key_buf_ptr / KEY_SIZE;
-        assert (nmemb*KEY_SIZE == key_buf_ptr);
+        assert (nmemb * (int) KEY_SIZE == key_buf_ptr);
         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)
@@ -533,7 +555,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);
@@ -563,8 +584,8 @@ void progressFunc (struct key_file *keyp, void *info)
     if (now >= p->lastTime+10)
     {
         p->lastTime = now;
-        remaining = (now - p->startTime)*
-            ((double) p->totalBytes/p->totalOffset - 1.0);
+        remaining = (time_t) ((now - p->startTime)*
+            ((double) p->totalBytes/p->totalOffset - 1.0));
         if (remaining <= 130)
             logf (LOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
                  (100.0*p->totalOffset) / p->totalBytes, (long) remaining);
@@ -579,7 +600,7 @@ void progressFunc (struct key_file *keyp, void *info)
 #define R_OK 4
 #endif
 
-void key_input (int nkeys, int cache)
+void key_input (BFiles bfs, int nkeys, int cache)
                 
 {
     Dict dict;
@@ -605,15 +626,16 @@ void key_input (int nkeys, int cache)
         if (!nkeys)
             return ;
     }
-    dict = dict_open (FNAME_DICT, cache, 1);
+    dict = dict_open (bfs, FNAME_DICT, cache, 1);
     if (!dict)
     {
         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 (FNAME_ISAMC, 1, key_isamc_m ());
+        isamc = isc_open (bfs,
+                         FNAME_ISAMC, 1, key_isamc_m (common_resource));
         if (!isamc)
         {
             logf (LOG_FATAL, "isc_open fail");
@@ -622,7 +644,8 @@ void key_input (int nkeys, int cache)
     }
     else
     {
-        isam = is_open (FNAME_ISAM, key_compare, 1, sizeof(struct it_key));
+        isam = is_open (bfs, FNAME_ISAM, key_compare, 1,
+                       sizeof(struct it_key), common_resource);
         if (!isam)
         {
             logf (LOG_FATAL, "is_open fail");