X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=4d261813b46e4f3b331f84e7665d98cb2c1f860b;hp=f98c0d557a45b275a8491b0606fe4919913ae0a6;hb=f3f20a205132c39c9434b10086422c6b49b47faf;hpb=9b7dbbec2a6a910a2883ea3da5e6136e9240f820

diff --git a/index/kinput.c b/index/kinput.c
index f98c0d5..4d26181 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,8 +1,5 @@
-/* $Id: kinput.c,v 1.73 2006-05-09 08:12:22 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
- 
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <fcntl.h>
 #ifdef WIN32
 #include <io.h>
@@ -36,8 +36,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #define KEY_SIZE (1+sizeof(struct it_key))
 #define INP_NAME_MAX 768
-#define INP_BUF_START 60000
-#define INP_BUF_ADD  400000
 
 struct key_file {
     int   no;            /* file no */
@@ -55,7 +53,12 @@ struct key_file {
     Res res;
 };
 
-#if 0
+
+#define PR_KEY_LOW 0
+#define PR_KEY_TOP 0
+
+#if PR_KEY_LOW || PR_KEY_TOP
+
 static void pkey(const char *b, int mode)
 {
     key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d");
@@ -63,83 +66,83 @@ static void pkey(const char *b, int mode)
 #endif
 
 
-void getFnameTmp (Res res, char *fname, int no)
+void getFnameTmp(Res res, char *fname, int no)
 {
     const char *pre;
-    
-    pre = res_get_def (res, "keyTmpDir", ".");
-    sprintf (fname, "%s/key%d.tmp", pre, no);
+
+    pre = res_get_def(res, "keyTmpDir", ".");
+    sprintf(fname, "%s/key%d.tmp", pre, no);
 }
 
-void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no)
+void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no)
 {
     const char *pre;
-    
-    pre = res_get_def (zh->res, "keyTmpDir", ".");
-    sprintf (fname, "%s/key%d.tmp", pre, no);
+
+    pre = res_get_def(zh->res, "keyTmpDir", ".");
+    sprintf(fname, "%s/key%d.tmp", pre, no);
 }
 
-void key_file_chunk_read (struct key_file *f)
+void key_file_chunk_read(struct key_file *f)
 {
     int nr = 0, r = 0, fd;
     char fname[1024];
-    getFnameTmp (f->res, fname, f->no);
-    fd = open (fname, O_BINARY|O_RDONLY);
+    getFnameTmp(f->res, fname, f->no);
+    fd = open(fname, O_BINARY|O_RDONLY);
 
     f->buf_ptr = 0;
     f->buf_size = 0;
     if (fd == -1)
     {
-        yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot open %s", fname);
+        yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot open %s", fname);
 	return ;
     }
     if (!f->length)
     {
-        if ((f->length = lseek (fd, 0L, SEEK_END)) == (off_t) -1)
+        if ((f->length = lseek(fd, 0L, SEEK_END)) == (off_t) -1)
         {
-            yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
-	    close (fd);
+            yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
+	    close(fd);
 	    return ;
         }
     }
-    if (lseek (fd, f->offset, SEEK_SET) == -1)
+    if (lseek(fd, f->offset, SEEK_SET) == -1)
     {
-        yaz_log (YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
+        yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
 	close(fd);
 	return ;
     }
     while (f->chunk - nr > 0)
     {
-        r = read (fd, f->buf + nr, f->chunk - nr);
+        r = read(fd, f->buf + nr, f->chunk - nr);
         if (r <= 0)
             break;
         nr += r;
     }
     if (r == -1)
     {
-        yaz_log (YLOG_WARN|YLOG_ERRNO, "read of %s", fname);
-	close (fd);
+        yaz_log(YLOG_WARN|YLOG_ERRNO, "read of %s", fname);
+	close(fd);
 	return;
     }
     f->buf_size = nr;
     if (f->readHandler)
         (*f->readHandler)(f, f->readInfo);
-    close (fd);
+    close(fd);
 }
 
-void key_file_destroy (struct key_file *f)
+void key_file_destroy(struct key_file *f)
 {
     iscz1_stop(f->decode_handle);
-    xfree (f->buf);
-    xfree (f->prev_name);
-    xfree (f);
+    xfree(f->buf);
+    xfree(f->prev_name);
+    xfree(f);
 }
 
-struct key_file *key_file_init (int no, int chunk, Res res)
+struct key_file *key_file_init(int no, int chunk, Res res)
 {
     struct key_file *f;
 
-    f = (struct key_file *) xmalloc (sizeof(*f));
+    f = (struct key_file *) xmalloc(sizeof(*f));
     f->res = res;
     f->decode_handle = iscz1_start();
     f->no = no;
@@ -147,54 +150,28 @@ struct key_file *key_file_init (int no, int chunk, Res res)
     f->offset = 0;
     f->length = 0;
     f->readHandler = NULL;
-    f->buf = (unsigned char *) xmalloc (f->chunk);
-    f->prev_name = (char *) 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);
+    key_file_chunk_read(f);
     return f;
 }
 
-int key_file_getc (struct key_file *f)
+int key_file_getc(struct key_file *f)
 {
     if (f->buf_ptr < f->buf_size)
         return f->buf[(f->buf_ptr)++];
     if (f->buf_size < f->chunk)
         return EOF;
     f->offset += f->buf_size;
-    key_file_chunk_read (f);
+    key_file_chunk_read(f);
     if (f->buf_ptr < f->buf_size)
         return f->buf[(f->buf_ptr)++];
     else
         return EOF;
 }
 
-int key_file_decode (struct key_file *f)
-{
-    int c, d;
-
-    c = key_file_getc (f);
-    switch (c & 192) 
-    {
-    case 0:
-        d = c;
-        break;
-    case 64:
-        d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
-        break;
-    case 128:
-        d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
-        d = (d << 8) + (key_file_getc (f) & 0xff);
-        break;
-    default: /* 192 */
-        d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
-        d = (d << 8) + (key_file_getc (f) & 0xff);
-        d = (d << 8) + (key_file_getc (f) & 0xff);
-        break;
-    }
-    return d;
-}
-
-int key_file_read (struct key_file *f, char *key)
+int key_file_read(struct key_file *f, char *key)
 {
     int i, c;
     char srcbuf[128];
@@ -202,11 +179,11 @@ int key_file_read (struct key_file *f, char *key)
     char *dst;
     int j;
 
-    c = key_file_getc (f);
+    c = key_file_getc(f);
     if (c == 0)
     {
-        strcpy (key, f->prev_name);
-        i = 1+strlen (key);
+        strcpy(key, f->prev_name);
+        i = 1+strlen(key);
     }
     else if (c == EOF)
         return 0;
@@ -214,9 +191,13 @@ int key_file_read (struct key_file *f, char *key)
     {
         i = 0;
         key[i++] = c;
-        while ((key[i++] = key_file_getc (f)))
-            ;
-        strcpy (f->prev_name, key);
+        while ((c = key_file_getc(f)))
+        {
+            if (i < INP_NAME_MAX-2)
+                key[i++] = c;
+        }
+        key[i++] = '\0';
+        strcpy(f->prev_name, key);
 	iscz1_reset(f->decode_handle);
     }
     c = key_file_getc(f); /* length +  insert/delete combined */
@@ -250,23 +231,21 @@ struct heap_info {
     int    (*cmp)(const void *p1, const void *p2);
     struct zebra_register *reg;
     ZebraHandle zh;
-    int raw_reading; /* 1=raw /mem read. 0=file reading */
-    int no_diffs;
-    int no_updates;
-    int no_deletions;
-    int no_insertions;
-    int no_iterations;
+    zint no_diffs;
+    zint no_updates;
+    zint no_deletions;
+    zint no_insertions;
+    zint no_iterations;
 };
 
-static struct heap_info *key_heap_malloc()
+static struct heap_info *key_heap_malloc(void)
 {  /* malloc and clear it */
     struct heap_info *hi;
-    hi = (struct heap_info *) xmalloc (sizeof(*hi));
+    hi = (struct heap_info *) xmalloc(sizeof(*hi));
     hi->info.file = 0;
     hi->info.buf = 0;
     hi->heapnum = 0;
     hi->ptr = 0;
-    hi->raw_reading = 0;
     hi->no_diffs = 0;
     hi->no_diffs = 0;
     hi->no_updates = 0;
@@ -286,42 +265,30 @@ struct heap_info *key_heap_init_file(ZebraHandle zh,
     hi = key_heap_malloc();
     hi->zh = zh;
     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->ptr = (int *) xmalloc (sizeof(*hi->ptr) * (1+nkeys));
+        xmalloc(sizeof(*hi->info.file) * (1+nkeys));
+    hi->info.buf = (char **) xmalloc(sizeof(*hi->info.buf) * (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] = (char *) xmalloc (INP_NAME_MAX);
+        hi->info.buf[i] = (char *) xmalloc(INP_NAME_MAX);
     }
     return hi;
 }
 
-struct heap_info *key_heap_init_raw(ZebraHandle zh,
-				    int (*cmp)(const void *p1, const void *p2))
-{
-    struct heap_info *hi=key_heap_malloc();
-    hi->cmp = cmp;
-    hi->zh = zh;
-    hi->raw_reading = 1;
-    return hi;
-}
-
-void key_heap_destroy (struct heap_info *hi, int nkeys)
+void key_heap_destroy(struct heap_info *hi, int nkeys)
 {
     int i;
-    if (!hi->raw_reading)
-        for (i = 0; i<=nkeys; i++)
-            xfree (hi->info.buf[i]);
-    
-    xfree (hi->info.buf);
-    xfree (hi->ptr);
-    xfree (hi->info.file);
-    xfree (hi);
+    for (i = 0; i<=nkeys; i++)
+        xfree(hi->info.buf[i]);
+    xfree(hi->info.buf);
+    xfree(hi->ptr);
+    xfree(hi->info.file);
+    xfree(hi);
 }
 
-static void key_heap_swap (struct heap_info *hi, int i1, int i2)
+static void key_heap_swap(struct heap_info *hi, int i1, int i2)
 {
     int swap;
 
@@ -331,13 +298,13 @@ static void key_heap_swap (struct heap_info *hi, int i1, int i2)
 }
 
 
-static void key_heap_delete (struct heap_info *hi)
+static void key_heap_delete(struct heap_info *hi)
 {
     int cur = 1, child = 2;
 
-    assert (hi->heapnum > 0);
+    assert(hi->heapnum > 0);
 
-    key_heap_swap (hi, 1, hi->heapnum);
+    key_heap_swap(hi, 1, hi->heapnum);
     hi->heapnum--;
     while (child <= hi->heapnum) {
         if (child < hi->heapnum &&
@@ -346,8 +313,8 @@ static void key_heap_delete (struct heap_info *hi)
             child++;
         if ((*hi->cmp)(&hi->info.buf[hi->ptr[cur]],
                        &hi->info.buf[hi->ptr[child]]) > 0)
-        {            
-            key_heap_swap (hi, cur, child);
+        {
+            key_heap_swap(hi, cur, child);
             cur = child;
             child = 2*cur;
         }
@@ -356,89 +323,71 @@ static void key_heap_delete (struct heap_info *hi)
     }
 }
 
-static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes,
+static void key_heap_insert(struct heap_info *hi, const char *buf, int nbytes,
                              struct key_file *kf)
 {
     int cur, parent;
 
+    assert(nbytes < INP_NAME_MAX);
+
     cur = ++(hi->heapnum);
-    memcpy (hi->info.buf[hi->ptr[cur]], buf, nbytes);
+    memcpy(hi->info.buf[hi->ptr[cur]], buf, nbytes);
     hi->info.file[hi->ptr[cur]] = kf;
 
     parent = cur/2;
     while (parent && (*hi->cmp)(&hi->info.buf[hi->ptr[parent]],
                                 &hi->info.buf[hi->ptr[cur]]) > 0)
     {
-        key_heap_swap (hi, cur, parent);
+        key_heap_swap(hi, cur, parent);
         cur = parent;
         parent = cur/2;
     }
 }
 
-static int heap_read_one_raw(struct heap_info *hi, char *name, char *key)
-{
-    ZebraHandle zh = hi->zh;
-    size_t ptr_i = zh->reg->ptr_i;
-    char *cp;
-    if (!ptr_i)
-        return 0;
-    --(zh->reg->ptr_i);
-    cp=(zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
-    strcpy(name, cp);
-    memcpy(key, cp+strlen(name)+1, KEY_SIZE);
-    hi->no_iterations++;
-    return 1;
-}
-
-static int heap_read_one (struct heap_info *hi, char *name, char *key)
+static int heap_read_one(struct heap_info *hi, char *name, char *key)
 {
     int n, r;
     char rbuf[INP_NAME_MAX];
     struct key_file *kf;
 
-    if (hi->raw_reading)
-        return heap_read_one_raw(hi, name, key);
-
     if (!hi->heapnum)
         return 0;
     n = hi->ptr[1];
-    strcpy (name, hi->info.buf[n]);
+    strcpy(name, hi->info.buf[n]);
     kf = hi->info.file[n];
     r = strlen(name);
-    memcpy (key, hi->info.buf[n] + r+1, KEY_SIZE);
-    key_heap_delete (hi);
-    if ((r = key_file_read (kf, rbuf)))
-        key_heap_insert (hi, rbuf, r, kf);
+    memcpy(key, hi->info.buf[n] + r+1, KEY_SIZE);
+    key_heap_delete(hi);
+    if ((r = key_file_read(kf, rbuf)))
+        key_heap_insert(hi, rbuf, r, kf);
     hi->no_iterations++;
     return 1;
 }
 
-#define PR_KEY_LOW 0
-#define PR_KEY_TOP 0
 
-#if 0
 /* for debugging only */
-static void print_dict_item(ZebraHandle zh, const char *s)
+void zebra_log_dict_entry(ZebraHandle zh, const char *s)
 {
-    char dst[IT_MAX_WORD+1];
+    char dst[INP_NAME_MAX+1];
     int ord;
     int len = key_SU_decode(&ord, (const unsigned char *) s);
-    int index_type;
-    const char *db = 0;
+    const char *index_type;
 
     if (!zh)
         yaz_log(YLOG_LOG, "ord=%d", ord);
     else
     {
-        zebraExplain_lookup_ord (zh->reg->zei,
-			     ord, &index_type, &db, 0, 0, 0);
+        const char *string_index;
+        const char *db = 0;
+        zebraExplain_lookup_ord(zh->reg->zei,
+                                ord, &index_type, &db, &string_index);
 
         zebra_term_untrans(zh, index_type, dst, s + len);
 
-        yaz_log(YLOG_LOG, "ord=%d term=%s", ord, dst);
+        yaz_log(YLOG_LOG, "ord=%d index_type=%s index=%s term=%s",
+                ord, index_type, string_index, dst);
     }
 }
-#endif
 
 struct heap_cread_info {
     char prev_name[INP_NAME_MAX];
@@ -454,7 +403,7 @@ struct heap_cread_info {
     int look_level;
 };
 
-static int heap_cread_item (void *vp, char **dst, int *insertMode);
+static int heap_cread_item(void *vp, char **dst, int *insertMode);
 
 int heap_cread_item2(void *vp, char **dst, int *insertMode)
 {
@@ -473,8 +422,8 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode)
 	    *insertMode = 0;
 	    p->look_level++;
 	}
-	memcpy (*dst, p->key_1, p->sz_1);
-#if 0
+	memcpy(*dst, p->key_1, p->sz_1);
+#if PR_KEY_TOP
 	yaz_log(YLOG_LOG, "DUP level=%d", p->look_level);
 	pkey(*dst, *insertMode);
 #endif
@@ -496,7 +445,7 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode)
     {        /* lookahead in 2 . Now in 1. */
         p->sz_1 = p->sz_2;
         p->mode_1 = p->mode_2;
-        memcpy (p->key_1, p->key_2, p->sz_2);
+        memcpy(p->key_1, p->key_2, p->sz_2);
     }
     if (p->mode_1)
         level = 1;     /* insert */
@@ -529,7 +478,7 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode)
             /* all the same. new round .. */
             p->sz_1 = p->sz_2;
             p->mode_1 = p->mode_2;
-            memcpy (p->key_1, p->key_2, p->sz_1);
+            memcpy(p->key_1, p->key_2, p->sz_1);
             if (p->mode_1)
                 level = 1;     /* insert */
             else
@@ -548,15 +497,16 @@ int heap_cread_item2(void *vp, char **dst, int *insertMode)
 	level++;
     }
     p->look_level = level;
-    memcpy (*dst, p->key_1, p->sz_1);
-#if 0
+    memcpy(*dst, p->key_1, p->sz_1);
+#if PR_KEY_TOP
+    yaz_log(YLOG_LOG, "TOP");
     pkey(*dst, *insertMode);
 #endif
     (*dst) += p->sz_1;
     return 1;
 }
-      
-int heap_cread_item (void *vp, char **dst, int *insertMode)
+
+int heap_cread_item(void *vp, char **dst, int *insertMode)
 {
     struct heap_cread_info *p = (struct heap_cread_info *) vp;
     struct heap_info *hi = p->hi;
@@ -564,34 +514,36 @@ int heap_cread_item (void *vp, char **dst, int *insertMode)
     if (p->first_in_list)
     {
         *insertMode = p->key[0];
-        memcpy (*dst, p->key+1, sizeof(struct it_key));
+        memcpy(*dst, p->key+1, sizeof(struct it_key));
 #if PR_KEY_LOW
+        zebra_log_dict_entry(hi->zh, p->cur_name);
         pkey(*dst, *insertMode);
 #endif
         (*dst) += sizeof(struct it_key);
         p->first_in_list = 0;
         return 1;
     }
-    strcpy (p->prev_name, p->cur_name);
-    if (!(p->more = heap_read_one (hi, p->cur_name, p->key)))
+    strcpy(p->prev_name, p->cur_name);
+    if (!(p->more = heap_read_one(hi, p->cur_name, p->key)))
         return 0;
-    if (*p->cur_name && strcmp (p->cur_name, p->prev_name))
+    if (*p->cur_name && strcmp(p->cur_name, p->prev_name))
     {
         p->first_in_list = 1;
         return 0;
     }
     *insertMode = p->key[0];
-    memcpy (*dst, p->key+1, sizeof(struct it_key));
+    memcpy(*dst, p->key+1, sizeof(struct it_key));
 #if PR_KEY_LOW
+    zebra_log_dict_entry(hi->zh, p->cur_name);
     pkey(*dst, *insertMode);
 #endif
     (*dst) += sizeof(struct it_key);
     return 1;
 }
 
-int heap_inpc (struct heap_cread_info *hci, struct heap_info *hi)
+int heap_inpc(struct heap_cread_info *hci, struct heap_info *hi)
 {
-    ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i));
+    ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i));
 
     isamc_i->clientData = hci;
     isamc_i->read_item = heap_cread_item2;
@@ -602,65 +554,45 @@ int heap_inpc (struct heap_cread_info *hci, struct heap_info *hi)
         ISAM_P isamc_p, isamc_p2;
         char *dict_info;
 
-        strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+        strcpy(this_name, hci->cur_name);
+	assert(hci->cur_name[0]);
         hi->no_diffs++;
-        if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
+        if ((dict_info = dict_lookup(hi->reg->dict, hci->cur_name)))
         {
-            memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P));
+            memcpy(&isamc_p, dict_info+1, sizeof(ISAM_P));
 	    isamc_p2 = isamc_p;
-            isamc_merge (hi->reg->isamc, &isamc_p2, isamc_i);
+            isamc_merge(hi->reg->isamc, &isamc_p2, isamc_i);
             if (!isamc_p2)
             {
                 hi->no_deletions++;
-                if (!dict_delete (hi->reg->dict, this_name))
+                if (!dict_delete(hi->reg->dict, this_name))
                     abort();
             }
-            else 
+            else
             {
                 hi->no_updates++;
                 if (isamc_p2 != isamc_p)
-                    dict_insert (hi->reg->dict, this_name,
+                    dict_insert(hi->reg->dict, this_name,
                                  sizeof(ISAM_P), &isamc_p2);
             }
-        } 
+        }
         else
         {
 	    isamc_p = 0;
-	    isamc_merge (hi->reg->isamc, &isamc_p, isamc_i);
+	    isamc_merge(hi->reg->isamc, &isamc_p, isamc_i);
             hi->no_insertions++;
 	    if (isamc_p)
-		dict_insert (hi->reg->dict, this_name,
+		dict_insert(hi->reg->dict, this_name,
 			     sizeof(ISAM_P), &isamc_p);
         }
     }
-    xfree (isamc_i);
-    return 0;
-} 
-
-int heap_inp0(struct heap_cread_info *hci, struct heap_info *hi)
-{
-    while (hci->more)
-    {
-        char this_name[INP_NAME_MAX];
-	char mybuf[1024];
-	char *dst = mybuf;
-	int mode;
-
-        strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
-        hi->no_diffs++;
-
-	while (heap_cread_item2(hci, &dst, &mode))
-	    ;
-    }
+    xfree(isamc_i);
     return 0;
-} 
-
+}
 
 int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi)
 {
-    ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i));
+    ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i));
 
     isamc_i->clientData = hci;
     isamc_i->read_item = heap_cread_item2;
@@ -671,50 +603,50 @@ int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi)
         ISAM_P isamc_p, isamc_p2;
         char *dict_info;
 
-        strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+        strcpy(this_name, hci->cur_name);
+	assert(hci->cur_name[0]);
         hi->no_diffs++;
 
 #if 0
 	assert(hi->zh);
-        print_dict_item(hi->zh, hci->cur_name);
+        zebra_log_dict_entry(hi->zh, hci->cur_name);
 #endif
-        if ((dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
+        if ((dict_info = dict_lookup(hi->reg->dict, hci->cur_name)))
         {
-            memcpy (&isamc_p, dict_info+1, sizeof(ISAM_P));
+            memcpy(&isamc_p, dict_info+1, sizeof(ISAM_P));
 	    isamc_p2 = isamc_p;
-            isamb_merge (hi->reg->isamb, &isamc_p2, isamc_i);
+            isamb_merge(hi->reg->isamb, &isamc_p2, isamc_i);
             if (!isamc_p2)
             {
                 hi->no_deletions++;
-                if (!dict_delete (hi->reg->dict, this_name))
+                if (!dict_delete(hi->reg->dict, this_name))
                     abort();
             }
-            else 
+            else
             {
                 hi->no_updates++;
                 if (isamc_p2 != isamc_p)
-                    dict_insert (hi->reg->dict, this_name,
+                    dict_insert(hi->reg->dict, this_name,
                                  sizeof(ISAM_P), &isamc_p2);
             }
-        } 
+        }
         else
         {
 	    isamc_p = 0;
-            isamb_merge (hi->reg->isamb, &isamc_p, isamc_i);
+            isamb_merge(hi->reg->isamb, &isamc_p, isamc_i);
             hi->no_insertions++;
 	    if (isamc_p)
-		dict_insert (hi->reg->dict, this_name,
+		dict_insert(hi->reg->dict, this_name,
 			     sizeof(ISAM_P), &isamc_p);
         }
     }
     xfree(isamc_i);
     return 0;
-} 
+}
 
-int heap_inps (struct heap_cread_info *hci, struct heap_info *hi)
+int heap_inps(struct heap_cread_info *hci, struct heap_info *hi)
 {
-    ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i));
+    ISAMS_I isams_i = (ISAMS_I) xmalloc(sizeof(*isams_i));
 
     isams_i->clientData = hci;
     isams_i->read_item = heap_cread_item;
@@ -725,24 +657,24 @@ int heap_inps (struct heap_cread_info *hci, struct heap_info *hi)
         ISAM_P isams_p;
         char *dict_info;
 
-        strcpy (this_name, hci->cur_name);
-	assert (hci->cur_name[1]);
+        strcpy(this_name, hci->cur_name);
+	assert(hci->cur_name[0]);
         hi->no_diffs++;
-        if (!(dict_info = dict_lookup (hi->reg->dict, hci->cur_name)))
+        if (!(dict_info = dict_lookup(hi->reg->dict, hci->cur_name)))
         {
-            isams_p = isams_merge (hi->reg->isams, isams_i);
+            isams_p = isams_merge(hi->reg->isams, isams_i);
             hi->no_insertions++;
-            dict_insert (hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p);
+            dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p);
         }
 	else
 	{
-	    yaz_log (YLOG_FATAL, "isams doesn't support this kind of update");
+	    yaz_log(YLOG_FATAL, "isams doesn't support this kind of update");
 	    break;
 	}
     }
-    xfree (isams_i);
+    xfree(isams_i);
     return 0;
-} 
+}
 
 struct progressInfo {
     time_t   startTime;
@@ -751,7 +683,7 @@ struct progressInfo {
     off_t    totalOffset;
 };
 
-void progressFunc (struct key_file *keyp, void *info)
+void progressFunc(struct key_file *keyp, void *info)
 {
     struct progressInfo *p = (struct progressInfo *) info;
     time_t now, remaining;
@@ -766,10 +698,10 @@ void progressFunc (struct key_file *keyp, void *info)
         remaining = (time_t) ((now - p->startTime)*
             ((double) p->totalBytes/p->totalOffset - 1.0));
         if (remaining <= 130)
-            yaz_log (YLOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
+            yaz_log(YLOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
                  (100.0*p->totalOffset) / p->totalBytes, (long) remaining);
         else
-            yaz_log (YLOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
+            yaz_log(YLOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
 	         (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
     }
     p->totalOffset += keyp->buf_size;
@@ -779,109 +711,103 @@ void progressFunc (struct key_file *keyp, void *info)
 #define R_OK 4
 #endif
 
-void zebra_index_merge (ZebraHandle zh)
+void zebra_index_merge(ZebraHandle zh)
 {
     struct key_file **kf = 0;
     char rbuf[1024];
     int i, r;
     struct heap_info *hi;
     struct progressInfo progressInfo;
-    int nkeys = zh->reg->key_file_no;
-    int usefile; 
-    yaz_log (YLOG_DEBUG, " index_merge called with nk=%d b=%p", 
-                    nkeys, zh->reg->key_buf);
-    if ( (nkeys==0) && (zh->reg->key_buf==0) )
-        return; /* nothing to merge - probably flush after end-trans */
-    
-    usefile = (nkeys!=0); 
-
-    if (usefile)
+    int nkeys = key_block_get_no_files(zh->reg->key_block);
+
+    if (nkeys == 0)
+        return;
+
+    if (nkeys < 0)
     {
-        if (nkeys < 0)
-        {
-            char fname[1024];
-            nkeys = 0;
-            while (1)
-            {
-                extract_get_fname_tmp  (zh, fname, nkeys+1);
-                if (access (fname, R_OK) == -1)
-                        break;
-                nkeys++;
-            }
-            if (!nkeys)
-                return ;
-        }
-        kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf));
-        progressInfo.totalBytes = 0;
-        progressInfo.totalOffset = 0;
-        time (&progressInfo.startTime);
-        time (&progressInfo.lastTime);
-        for (i = 1; i<=nkeys; i++)
+        char fname[1024];
+        nkeys = 0;
+        while (1)
         {
-            kf[i] = key_file_init (i, 8192, zh->res);
-            kf[i]->readHandler = progressFunc;
-            kf[i]->readInfo = &progressInfo;
-            progressInfo.totalBytes += kf[i]->length;
-            progressInfo.totalOffset += kf[i]->buf_size;
+            extract_get_fname_tmp (zh, fname, nkeys+1);
+            if (access(fname, R_OK) == -1)
+                break;
+            nkeys++;
         }
-        hi = key_heap_init_file(zh, nkeys, key_qsort_compare);
-        hi->reg = zh->reg;
-        
-        for (i = 1; i<=nkeys; i++)
-            if ((r = key_file_read (kf[i], rbuf)))
-                key_heap_insert (hi, rbuf, r, kf[i]);
-    }  /* use file */
-    else 
-    { /* do not use file, read straight from buffer */
-        hi = key_heap_init_raw(zh, key_qsort_compare);
-        hi->reg = zh->reg;
+        if (!nkeys)
+            return ;
+    }
+    kf = (struct key_file **) xmalloc((1+nkeys) * sizeof(*kf));
+    progressInfo.totalBytes = 0;
+    progressInfo.totalOffset = 0;
+    time(&progressInfo.startTime);
+    time(&progressInfo.lastTime);
+    for (i = 1; i<=nkeys; i++)
+    {
+        kf[i] = key_file_init(i, 8192, zh->res);
+        kf[i]->readHandler = progressFunc;
+        kf[i]->readInfo = &progressInfo;
+        progressInfo.totalBytes += kf[i]->length;
+        progressInfo.totalOffset += kf[i]->buf_size;
     }
+    hi = key_heap_init_file(zh, nkeys, key_qsort_compare);
+    hi->reg = zh->reg;
+
+    for (i = 1; i<=nkeys; i++)
+        if ((r = key_file_read(kf[i], rbuf)))
+            key_heap_insert(hi, rbuf, r, kf[i]);
 
     if (1)
     {
-	struct heap_cread_info hci;
-    
-	hci.key = (char *) xmalloc (KEY_SIZE);
-	hci.key_1 = (char *) xmalloc (KEY_SIZE);
-	hci.key_2 = (char *) xmalloc (KEY_SIZE);
+        struct heap_cread_info hci;
+
+        hci.key = (char *) xmalloc(KEY_SIZE);
+	hci.key_1 = (char *) xmalloc(KEY_SIZE);
+	hci.key_2 = (char *) xmalloc(KEY_SIZE);
 	hci.ret = -1;
 	hci.first_in_list = 1;
 	hci.hi = hi;
 	hci.look_level = 0;
-	hci.more = heap_read_one (hi, hci.cur_name, hci.key);    
-	
+	hci.more = heap_read_one(hi, hci.cur_name, hci.key);
+
 	if (zh->reg->isams)
 	    heap_inps(&hci, hi);
 	if (zh->reg->isamc)
 	    heap_inpc(&hci, hi);
 	if (zh->reg->isamb)
 	    heap_inpb(&hci, hi);
-	
-	xfree (hci.key);
-	xfree (hci.key_1);
-	xfree (hci.key_2);
+
+	xfree(hci.key);
+	xfree(hci.key_1);
+	xfree(hci.key_2);
     }
-	
-    if (usefile)
+
+    for (i = 1; i<=nkeys; i++)
     {
-        for (i = 1; i<=nkeys; i++)
-        {
-            extract_get_fname_tmp  (zh, rbuf, i);
-            unlink (rbuf);
-        }
-        for (i = 1; i<=nkeys; i++)
-            key_file_destroy (kf[i]);
-        xfree (kf);
+        extract_get_fname_tmp (zh, rbuf, i);
+        unlink(rbuf);
     }
+    for (i = 1; i<=nkeys; i++)
+        key_file_destroy(kf[i]);
+    xfree(kf);
     if (hi->no_iterations)
     { /* do not log if nothing happened */
-        yaz_log (YLOG_LOG, "Iterations . . .%7d", hi->no_iterations);
-        yaz_log (YLOG_LOG, "Distinct words .%7d", hi->no_diffs);
-        yaz_log (YLOG_LOG, "Updates. . . . .%7d", hi->no_updates);
-        yaz_log (YLOG_LOG, "Deletions. . . .%7d", hi->no_deletions);
-        yaz_log (YLOG_LOG, "Insertions . . .%7d", hi->no_insertions);
+        yaz_log(YLOG_LOG, "Iterations: isam/dict "
+                ZINT_FORMAT "/" ZINT_FORMAT,
+                hi->no_iterations, hi->no_diffs);
+        yaz_log(YLOG_LOG, "Dict: inserts/updates/deletions: "
+                ZINT_FORMAT "/" ZINT_FORMAT "/" ZINT_FORMAT,
+                hi->no_insertions, hi->no_updates, hi->no_deletions);
     }
-    zh->reg->key_file_no = 0;
-
-    key_heap_destroy (hi, nkeys);
+    key_block_destroy(&zh->reg->key_block);
+    key_heap_destroy(hi, nkeys);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+