X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkey_block.c;h=085f2b21411e8b435efdaa468a7389332d60335c;hb=7253cbefce93c35a083505e14d97b3ae24c0a66b;hp=375e2c6ac8c6b5df3a9bd56e9916d4b853f36f27;hpb=dbb2d91da77e66472ebf9c9e5311a5b263ad66f1;p=idzebra-moved-to-github.git

diff --git a/index/key_block.c b/index/key_block.c
index 375e2c6..085f2b2 100644
--- a/index/key_block.c
+++ b/index/key_block.c
@@ -1,4 +1,4 @@
-/* $Id: key_block.c,v 1.3 2006-11-21 17:48:08 adam Exp $
+/* $Id: key_block.c,v 1.7 2006-12-03 15:55:02 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
@@ -29,9 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <pthread.h>
 #endif
 
-#include <yaz/nmem.h>
-#include "index.h"
 #include "key_block.h"
+#include <yaz/nmem.h>
+#include <yaz/xmalloc.h>
 
 struct zebra_key_block {
     char **key_buf;
@@ -64,8 +65,6 @@ struct encode_info {
     char buf[ENCODE_BUFLEN];
 };
 
-static int log_level = 0;
-
 #define USE_SHELLSORT 0
 
 #if USE_SHELLSORT
@@ -187,6 +186,11 @@ zebra_key_block_t key_block_create(int mem, const char *key_tmp_dir,
 {
     zebra_key_block_t p = xmalloc(sizeof(*p));
 
+#if YAZ_POSIX_THREADS
+    /* we'll be making two memory areas so cut in half */
+    if (use_threads)
+        mem = mem / 2;
+#endif
     p->key_buf = (char**) xmalloc (mem);
     p->ptr_top = mem/sizeof(char*);
     p->ptr_i = 0;
@@ -245,7 +249,7 @@ void key_block_destroy(zebra_key_block_t *pp)
     }
 }
 
-void key_block_write(zebra_key_block_t p,  SYSNO sysno, struct it_key *key_in,
+void key_block_write(zebra_key_block_t p, zint sysno, struct it_key *key_in,
                      int cmd, const char *str_buf, size_t str_len,
                      zint staticrank, int static_rank_enable)
 {
@@ -278,7 +282,10 @@ void key_block_write(zebra_key_block_t p,  SYSNO sysno, struct it_key *key_in,
     ((char*)p->key_buf)[(p->key_buf_used)++] = cmd;
     
     if (static_rank_enable)
+    {
+        assert(staticrank >= 0);
         key_out.mem[j++] = staticrank;
+    }
     
     if (key_in->mem[1]) /* filter specified record ID */
         key_out.mem[j++] = key_in->mem[1];
@@ -304,9 +311,6 @@ void key_block_flush_int(zebra_key_block_t p,
 
     (p->key_file_no)++;
     yaz_log(YLOG_LOG, "sorting section %d", (p->key_file_no));
-    yaz_log(log_level, "  sort_buff at %p n=%d",
-                    key_buf + ptr_top - ptr_i,ptr_i);
-
 
 #if USE_SHELLSORT
     shellsort(key_buf + ptr_top - ptr_i, ptr_i,