Partial port to WIN95/NT.

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

diff --git a/index/kinput.c b/index/kinput.c
index 89824d5..4da9460 100644 (file)
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -4,7 +4,27 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kinput.c,v $
- * Revision 1.19  1996-10-29 14:09:46  adam
+ * 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
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.22  1997/02/12 20:39:45  adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.21  1996/11/08 11:10:23  adam
+ * Buffers used during file match got bigger.
+ * Compressed ISAM support everywhere.
+ * Bug fixes regarding masking characters in queries.
+ * Redesigned Regexp-2 queries.
+ *
+ * Revision 1.20  1996/11/01 08:58:41  adam
+ * Interface to isamc system now includes update and delete.
+ *
+ * Revision 1.19  1996/10/29 14:09:46  adam
  * Use of cisam system - enabled if setting isamc is 1.
  *
  * Revision 1.18  1996/06/04 10:18:59  adam
@@ -71,7 +91,11 @@
  */
 
 #include <fcntl.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -119,7 +143,7 @@ void key_file_chunk_read (struct key_file *f)
     int nr = 0, r, fd;
     char fname[1024];
     getFnameTmp (fname, f->no);
-    fd = open (fname, O_RDONLY);
+    fd = open (fname, O_BINARY|O_RDONLY);
     if (fd == -1)
     {
         logf (LOG_FATAL|LOG_ERRNO, "cannot open %s", fname);
@@ -400,9 +424,7 @@ int heap_cread_item (void *vp, char **dst, int *insertMode)
 int heap_inpc (struct heap_info *hi)
 {
     struct heap_cread_info hci;
-    ISAMC_P isamc_p;
     ISAMC_I isamc_i = xmalloc (sizeof(*isamc_i));
-    void *dict_info;
 
     hci.key = xmalloc (KEY_SIZE);
     hci.mode = 1;
@@ -414,16 +436,33 @@ int heap_inpc (struct heap_info *hi)
 
     while (hci.more)
     {
+        char this_name[INP_NAME_MAX];
+        ISAMC_P isamc_p, isamc_p2;
+        char *dict_info;
+
+        strcpy (this_name, hci.cur_name);
         logf (LOG_DEBUG, "inserting %s", 1+hci.cur_name);
+        no_diffs++;
         if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
         {
-            logf (LOG_FATAL, "Cannot merge really yet! %s", hci.cur_name);
-            exit (1);
+            memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
+            isamc_p2 = isc_merge (hi->isamc, isamc_p, isamc_i);
+            if (!isamc_p2)
+            {
+                no_deletions++;
+                if (!dict_delete (hi->dict, this_name))
+                    abort();
+            }
+            else 
+            {
+                no_updates++;
+                if (isamc_p2 != isamc_p)
+                    dict_insert (hi->dict, this_name,
+                                 sizeof(ISAMC_P), &isamc_p2);
+            }
         } 
         else
         {
-            char this_name[128];
-            strcpy (this_name, hci.cur_name);
             isamc_p = isc_merge (hi->isamc, 0, isamc_i);
             no_insertions++;
             dict_insert (hi->dict, this_name, sizeof(ISAMC_P), &isamc_p);
@@ -536,6 +575,10 @@ void progressFunc (struct key_file *keyp, void *info)
     p->totalOffset += keyp->buf_size;
 }
 
+#ifndef R_OK
+#define R_OK 4
+#endif
+
 void key_input (int nkeys, int cache)
                 
 {
@@ -573,8 +616,8 @@ void key_input (int nkeys, int cache)
         isamc = isc_open (FNAME_ISAMC, 1, key_isamc_m ());
         if (!isamc)
         {
-           logf (LOG_FATAL, "isc_open fail");
-           exit (1);
+            logf (LOG_FATAL, "isc_open fail");
+            exit (1);
         }
     }
     else
@@ -616,7 +659,7 @@ void key_input (int nkeys, int cache)
         is_close (isam);
     if (isamc)
         isc_close (isamc);
-    
+   
     for (i = 1; i<=nkeys; i++)
     {
         getFnameTmp (rbuf, i);