X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=ee8b87c6a610f07cdc62a8bead871ca555766173;hp=c982b3f1c17e63fe7faad177ab3660c98a2ef8ff;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hpb=98a65c4df19ff025d24167f425610d809a93bf80

diff --git a/index/kinput.c b/index/kinput.c
index c982b3f..ee8b87c 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kinput.c,v $
- * Revision 1.30  1998-10-28 10:53:57  adam
+ * Revision 1.34  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.33  1999/05/15 14:36:38  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.32  1999/05/12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * 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
@@ -111,7 +123,7 @@
  */
 
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -205,7 +217,7 @@ struct key_file *key_file_init (int no, int chunk)
 {
     struct key_file *f;
 
-    f = xmalloc (sizeof(*f));
+    f = (struct key_file *) xmalloc (sizeof(*f));
     f->sysno = 0;
     f->seqno = 0;
     f->no = no;
@@ -213,8 +225,8 @@ struct key_file *key_file_init (int no, int chunk)
     f->offset = 0;
     f->length = 0;
     f->readHandler = NULL;
-    f->buf = xmalloc (f->chunk);
-    f->prev_name = xmalloc (INP_NAME_MAX);
+    f->buf = (unsigned char *) xmalloc (f->chunk);
+    f->prev_name = (char *) xmalloc (INP_NAME_MAX);
     *f->prev_name = '\0';
     key_file_chunk_read (f);
     return f;
@@ -309,6 +321,7 @@ struct heap_info {
     Dict dict;
     ISAM isam;
     ISAMC isamc;
+    ISAMS isams;
 };
 
 struct heap_info *key_heap_init (int nkeys,
@@ -317,16 +330,17 @@ struct heap_info *key_heap_init (int nkeys,
     struct heap_info *hi;
     int i;
 
-    hi = xmalloc (sizeof(*hi));
-    hi->info.file = xmalloc (sizeof(*hi->info.file) * (1+nkeys));
-    hi->info.buf = xmalloc (sizeof(*hi->info.buf) * (1+nkeys));
+    hi = (struct heap_info *) xmalloc (sizeof(*hi));
+    hi->info.file = (struct key_file **)
+	xmalloc (sizeof(*hi->info.file) * (1+nkeys));
+    hi->info.buf = (char **) xmalloc (sizeof(*hi->info.buf) * (1+nkeys));
     hi->heapnum = 0;
-    hi->ptr = xmalloc (sizeof(*hi->ptr) * (1+nkeys));
+    hi->ptr = (int *) xmalloc (sizeof(*hi->ptr) * (1+nkeys));
     hi->cmp = cmp;
     for (i = 0; i<= nkeys; i++)
     {
         hi->ptr[i] = i;
-        hi->info.buf[i] = xmalloc (INP_NAME_MAX);
+        hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX);
     }
     return hi;
 }
@@ -416,7 +430,7 @@ struct heap_cread_info {
       
 int heap_cread_item (void *vp, char **dst, int *insertMode)
 {
-    struct heap_cread_info *p = vp;
+    struct heap_cread_info *p = (struct heap_cread_info *) vp;
     struct heap_info *hi = p->hi;
 
     if (p->mode == 1)
@@ -444,9 +458,9 @@ int heap_cread_item (void *vp, char **dst, int *insertMode)
 int heap_inpc (struct heap_info *hi)
 {
     struct heap_cread_info hci;
-    ISAMC_I isamc_i = xmalloc (sizeof(*isamc_i));
+    ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i));
 
-    hci.key = xmalloc (KEY_SIZE);
+    hci.key = (char *) xmalloc (KEY_SIZE);
     hci.mode = 1;
     hci.hi = hi;
     hci.more = heap_read_one (hi, hci.cur_name, hci.key);
@@ -492,6 +506,42 @@ int heap_inpc (struct heap_info *hi)
     return 0;
 } 
 
+int heap_inps (struct heap_info *hi)
+{
+    struct heap_cread_info hci;
+    ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i));
+
+    hci.key = (char *) xmalloc (KEY_SIZE);
+    hci.mode = 1;
+    hci.hi = hi;
+    hci.more = heap_read_one (hi, hci.cur_name, hci.key);
+
+    isams_i->clientData = &hci;
+    isams_i->read_item = heap_cread_item;
+
+    while (hci.more)
+    {
+        char this_name[INP_NAME_MAX];
+        ISAMS_P isams_p;
+        char *dict_info;
+
+        strcpy (this_name, hci.cur_name);
+	assert (hci.cur_name[1]);
+        no_diffs++;
+        if (!(dict_info = dict_lookup (hi->dict, hci.cur_name)))
+        {
+            isams_p = isams_merge (hi->isams, isams_i);
+            no_insertions++;
+            dict_insert (hi->dict, this_name, sizeof(ISAMS_P), &isams_p);
+        }
+	else
+	    abort();
+    }
+    xfree (isams_i);
+    return 0;
+} 
+
+
 int heap_inp (struct heap_info *hi)
 {
     char *info;
@@ -503,8 +553,8 @@ int heap_inp (struct heap_info *hi)
     char *key_buf;
     int more;
     
-    next_key = xmalloc (KEY_SIZE);
-    key_buf = xmalloc (key_buf_size);
+    next_key = (char *) xmalloc (KEY_SIZE);
+    key_buf = (char *) xmalloc (key_buf_size);
     more = heap_read_one (hi, cur_name, key_buf);
     while (more)                   /* EOF ? */
     {
@@ -521,7 +571,7 @@ int heap_inp (struct heap_info *hi)
             if (key_buf_ptr+(int) KEY_SIZE >= key_buf_size)
             {
                 char *new_key_buf;
-                new_key_buf = xmalloc (key_buf_size + INP_BUF_ADD);
+                new_key_buf = (char *) xmalloc (key_buf_size + INP_BUF_ADD);
                 memcpy (new_key_buf, key_buf, key_buf_size);
                 key_buf_size += INP_BUF_ADD;
                 xfree (key_buf);
@@ -571,7 +621,7 @@ struct progressInfo {
 
 void progressFunc (struct key_file *keyp, void *info)
 {
-    struct progressInfo *p = info;
+    struct progressInfo *p = (struct progressInfo *) info;
     time_t now, remaining;
 
     if (keyp->buf_size <= 0 || p->totalBytes <= 0)
@@ -603,6 +653,7 @@ void key_input (BFiles bfs, int nkeys, int cache)
     Dict dict;
     ISAM isam = NULL;
     ISAMC isamc = NULL;
+    ISAMS isams = NULL;
     struct key_file **kf;
     char rbuf[1024];
     int i, r;
@@ -623,23 +674,23 @@ void key_input (BFiles bfs, int nkeys, int cache)
         if (!nkeys)
             return ;
     }
-    dict = dict_open (bfs, FNAME_DICT, cache, 1);
+    dict = dict_open (bfs, FNAME_DICT, cache, 1, 0);
     if (!dict)
     {
         logf (LOG_FATAL, "dict_open fail");
         exit (1);
     }
-    if (!res_get_match (common_resource, "isam", "i", NULL))
+    if (res_get_match (common_resource, "isam", "s", NULL))
     {
-        isamc = isc_open (bfs,
-			  FNAME_ISAMC, 1, key_isamc_m (common_resource));
-        if (!isamc)
+        isams = isams_open (bfs, FNAME_ISAMS, 1,
+			    key_isams_m (common_resource));
+        if (!isams)
         {
-            logf (LOG_FATAL, "isc_open fail");
+            logf (LOG_FATAL, "isams_open fail");
             exit (1);
         }
     }
-    else
+    else if (res_get_match (common_resource, "isam", "i", NULL))
     {
         isam = is_open (bfs, FNAME_ISAM, key_compare, 1,
 			sizeof(struct it_key), common_resource);
@@ -649,7 +700,17 @@ void key_input (BFiles bfs, int nkeys, int cache)
             exit (1);
         }
     }
-    kf = xmalloc ((1+nkeys) * sizeof(*kf));
+    else
+    {
+        isamc = isc_open (bfs, FNAME_ISAMC, 1,
+			  key_isamc_m (common_resource));
+        if (!isamc)
+        {
+            logf (LOG_FATAL, "isc_open fail");
+            exit (1);
+        }
+    }
+    kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf));
     progressInfo.totalBytes = 0;
     progressInfo.totalOffset = 0;
     time (&progressInfo.startTime);
@@ -666,19 +727,24 @@ void key_input (BFiles bfs, int nkeys, int cache)
     hi->dict = dict;
     hi->isam = isam;
     hi->isamc = isamc;
+    hi->isams = isams;
 
     for (i = 1; i<=nkeys; i++)
         if ((r = key_file_read (kf[i], rbuf)))
             key_heap_insert (hi, rbuf, r, kf[i]);
     if (isamc)
         heap_inpc (hi);
-    else
-        heap_inp (hi);
+    else if (isams)
+	heap_inps (hi);
+    else if (isam)
+	heap_inp (hi);
     dict_close (dict);
     if (isam)
         is_close (isam);
     if (isamc)
         isc_close (isamc);
+    if (isams)
+	isams_close (isams);
    
     for (i = 1; i<=nkeys; i++)
     {