X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Freckeys.c;h=d9b56d32aa3715ef810246f9ce333a25e271bd9c;hp=0ef2e3e06da7f46e354496ddc234043ae8470f55;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=4478d785b7769691261005c98063b98a5a5971b3

diff --git a/index/reckeys.c b/index/reckeys.c
index 0ef2e3e..d9b56d3 100644
--- a/index/reckeys.c
+++ b/index/reckeys.c
@@ -1,8 +1,5 @@
-/* $Id: reckeys.c,v 1.7 2006-08-14 10:40:15 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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
@@ -22,12 +19,13 @@ 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>
 
-#include <yaz/nmem.h>
-#include "index.h"
 #include "reckeys.h"
+#include <yaz/nmem.h>
+#include <yaz/xmalloc.h>
 
 struct zebra_rec_key_entry {
     char *buf;
@@ -44,10 +42,11 @@ struct zebra_rec_keys_t_ {
     void *encode_handle;
     void *decode_handle;
     char owner_of_buffer;
+    zint custom_record_id;
 
     NMEM nmem;
     size_t hash_size;
-    struct zebra_rec_key_entry **entries; 
+    struct zebra_rec_key_entry **entries;
 };
 
 
@@ -59,10 +58,14 @@ struct zebra_rec_key_entry **zebra_rec_keys_mk_hash(zebra_rec_keys_t p,
     unsigned h = 0;
     size_t i;
     int j;
+#if 0
+    h = key->mem[key->len-1];
+#else
     for (i = 0; i<len; i++)
 	h = h * 65509 + buf[i];
     for (j = 0; j<key->len; j++)
 	h = h * 65509 + CAST_ZINT_TO_INT(key->mem[j]);
+#endif
     return &p->entries[h % (unsigned) p->hash_size];
 }
 
@@ -79,7 +82,7 @@ static void init_hash(zebra_rec_keys_t p)
     }
 }
 
-zebra_rec_keys_t zebra_rec_keys_open()
+zebra_rec_keys_t zebra_rec_keys_open(void)
 {
     zebra_rec_keys_t p = xmalloc(sizeof(*p));
     p->buf_used = 0;
@@ -90,8 +93,9 @@ zebra_rec_keys_t zebra_rec_keys_open()
     p->encode_handle = iscz1_start();
     p->decode_handle = iscz1_start(); 
 
+    p->custom_record_id = 0;
     p->nmem = nmem_create();
-    p->hash_size = 1023;
+    p->hash_size = 32767;
     p->entries = 0;
 
     init_hash(p);
@@ -152,14 +156,19 @@ int zebra_rec_keys_add_hash(zebra_rec_keys_t keys,
 			    const char *str, size_t slen,
 			    const struct it_key *key)
 {
-    struct zebra_rec_key_entry **kep = zebra_rec_keys_mk_hash(keys,
-                                                              str, slen, key);
+    struct zebra_rec_key_entry **kep_first
+        = zebra_rec_keys_mk_hash(keys, str, slen, key);
+    struct zebra_rec_key_entry **kep = kep_first;
     while (*kep)
     {
 	struct zebra_rec_key_entry *e = *kep;
 	if (slen == e->len && !memcmp(str, e->buf, slen) &&
 	    !key_compare(key, &e->key))
 	{
+            *kep = (*kep)->next; /* out of queue */
+            e->next = *kep_first; /* move to front */
+            *kep_first = e;
+
 	    return 0;
 	}
 	kep = &(*kep)->next;
@@ -182,8 +191,21 @@ void zebra_rec_keys_write(zebra_rec_keys_t keys,
     
     assert(keys->owner_of_buffer);
 
+    if (key->mem[1]) /* record_id custom */
+    {
+        keys->custom_record_id = key->mem[1];
+    }
+#if 1
     if (!zebra_rec_keys_add_hash(keys, str, slen, key))
+    {
+#if 0
+        yaz_log(YLOG_LOG, "dup key slen=%d %.*s "
+                "ord=" ZINT_FORMAT " seq=" ZINT_FORMAT,
+                slen, slen, str, key->mem[0], key->mem[key->len-1]);
+#endif
 	return;  /* key already there . Omit it */
+    }
+#endif
     if (keys->buf_used+1024 > keys->buf_max)
     {
         char *b = (char *) xmalloc (keys->buf_max += 128000);
@@ -210,13 +232,14 @@ void zebra_rec_keys_reset(zebra_rec_keys_t keys)
     iscz1_reset(keys->encode_handle);
 
     init_hash(keys);
-
 }
 
 int zebra_rec_keys_rewind(zebra_rec_keys_t keys)
 {
     assert(keys);
     iscz1_reset(keys->decode_handle);
+
+
     keys->fetch_offset = 0;
     if (keys->buf_used == 0)
 	return 0;
@@ -256,9 +279,16 @@ int zebra_rec_keys_read(zebra_rec_keys_t keys,
     }
     return 1;
 }
+
+zint zebra_rec_keys_get_custom_record_id(zebra_rec_keys_t keys)
+{
+    return keys->custom_record_id;
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab