X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Freckeys.c;h=e5174abe01a4b1445b21778704fb109ffd856762;hp=3ba84539df477b0dc845968730571f978eb9ffdf;hb=de044fbb534d2db022ca965d0328dac7a6edf032;hpb=a1b0fc99b8a098eff3d56172af6dd249a28399b3

diff --git a/index/reckeys.c b/index/reckeys.c
index 3ba8453..e5174ab 100644
--- a/index/reckeys.c
+++ b/index/reckeys.c
@@ -1,8 +1,5 @@
-/* $Id: reckeys.c,v 1.9 2006-11-20 13:59:35 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
@@ -20,14 +17,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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 +45,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;
 };
 
 
@@ -92,8 +94,9 @@ zebra_rec_keys_t zebra_rec_keys_open(void)
     p->buf = 0;
     p->owner_of_buffer = 1;
     p->encode_handle = iscz1_start();
-    p->decode_handle = iscz1_start(); 
+    p->decode_handle = iscz1_start();
 
+    p->custom_record_id = 0;
     p->nmem = nmem_create();
     p->hash_size = 32767;
     p->entries = 0;
@@ -126,7 +129,7 @@ void zebra_rec_keys_set_buf(zebra_rec_keys_t p, char *buf, size_t sz,
     }
     p->owner_of_buffer = copy_buf;
 }
-	
+
 void zebra_rec_keys_get_buf(zebra_rec_keys_t p, char **buf, size_t *sz)
 {
     *buf = p->buf;
@@ -141,7 +144,7 @@ void zebra_rec_keys_close(zebra_rec_keys_t p)
 {
     if (!p)
 	return;
-    
+
     if (p->owner_of_buffer)
 	xfree(p->buf);
     if (p->encode_handle)
@@ -152,7 +155,7 @@ void zebra_rec_keys_close(zebra_rec_keys_t p)
     xfree(p);
 }
 
-int zebra_rec_keys_add_hash(zebra_rec_keys_t keys, 
+int zebra_rec_keys_add_hash(zebra_rec_keys_t keys,
 			    const char *str, size_t slen,
 			    const struct it_key *key)
 {
@@ -182,15 +185,19 @@ int zebra_rec_keys_add_hash(zebra_rec_keys_t keys,
     return 1;
 }
 
-void zebra_rec_keys_write(zebra_rec_keys_t keys, 
+void zebra_rec_keys_write(zebra_rec_keys_t keys,
 			  const char *str, size_t slen,
 			  const struct it_key *key)
 {
     char *dst;
     const char *src = (char*) key;
-    
+
     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))
     {
@@ -224,17 +231,18 @@ void zebra_rec_keys_reset(zebra_rec_keys_t keys)
 {
     assert(keys);
     keys->buf_used = 0;
-    
+
     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;
@@ -259,24 +267,31 @@ int zebra_rec_keys_read(zebra_rec_keys_t keys,
     {
 	const char *src = keys->buf + keys->fetch_offset;
 	char *dst = (char*) key;
-	
+
 	assert (keys->fetch_offset < keys->buf_used);
 
 	/* store the destination key */
 	iscz1_decode(keys->decode_handle, &dst, &src);
-	
+
 	/* store pointer to string and length of it */
 	*str = src;
 	*slen = strlen(src);
 	src += *slen + 1;
-	
+
 	keys->fetch_offset = src - keys->buf;
     }
     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