X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmarchash.c;h=ea25f6f625aeb31ed56f29309842ea70ae17ef09;hb=40da7ed5f74bb4ad3bbce81943622bc2cd9ab524;hp=6de22dec3004995ae704b660e99697e2b67e4530;hpb=096341d55d0f82fbfdf4c1389c2216c368d385f3;p=pazpar2-moved-to-github.git

diff --git a/src/marchash.c b/src/marchash.c
index 6de22de..ea25f6f 100644
--- a/src/marchash.c
+++ b/src/marchash.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2010 Index Data
 
 Pazpar2 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
@@ -21,6 +21,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief MARC MAP utilities (hash lookup etc)
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#else
+/* disable inline if AC_C_INLINE is not in use (Windows) */
+#define inline
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,26 +37,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <libxml/parser.h>
 #include <yaz/nmem.h>
 
-#include <marchash.h>
-
-// Jenkins one-at-a-time hash (from pp2 reclists.c, wikipedia)
-static unsigned int hash(const unsigned char *key)
-{
-    unsigned int hash = 0;
-
-    while (*key)
-    {
-        hash += *(key++);
-        hash += (hash << 10);
-        hash ^= (hash >> 6);
-    }
-    hash += (hash << 3);
-    hash ^= (hash >> 11);
-    hash += (hash << 15);
-    return hash;
-}
+#include "jenkins_hash.h"
+#include "marchash.h"
 
-inline void strtrimcat(char *dest, const char *src)
+static inline void strtrimcat(char *dest, const char *src)
 {
     const char *in;
     char *out;
@@ -75,7 +66,7 @@ inline void strtrimcat(char *dest, const char *src)
     *(++last_nonspace) = '\0';
 }
 
-inline void strtrimcpy(char *dest, const char *src)
+static inline void strtrimcpy(char *dest, const char *src)
 {
     *dest = '\0';
     strtrimcat(dest, src);
@@ -104,17 +95,23 @@ void marchash_ingest_marcxml(struct marchash *marchash, xmlNodePtr rec_node)
              field = NULL;
              if (!strcmp((const char *) field_node->name, "controlfield"))
              {
-                 field = marchash_add_field(
-                     marchash, 
-                     (const char *) xmlGetProp(field_node, BAD_CAST "tag"),
-                     (const char *) xmlNodeGetContent(field_node));
+                 xmlChar *content = xmlNodeGetContent(field_node);
+                 xmlChar *tag = xmlGetProp(field_node, BAD_CAST "tag");
+                 if (tag && content)
+                     field = marchash_add_field(
+                         marchash, (const char *) tag, (const char *) content);
+                 xmlFree(content);
+                 xmlFree(tag);
              }
              else if (!strcmp((const char *) field_node->name, "datafield"))
              {
-                 field = marchash_add_field(
-                     marchash,
-                     (const char *) xmlGetProp(field_node, BAD_CAST "tag"),
-                     (const char *) xmlNodeGetContent(field_node));
+                 xmlChar *content = xmlNodeGetContent(field_node);
+                 xmlChar *tag = xmlGetProp(field_node, BAD_CAST "tag");
+                 if (tag && content)
+                     field = marchash_add_field(
+                         marchash, (const char *) tag, (const char *) content);
+                 xmlFree(content);
+                 xmlFree(tag);
              }
              if (field)
              {
@@ -124,10 +121,14 @@ void marchash_ingest_marcxml(struct marchash *marchash, xmlNodePtr rec_node)
                      if ((sub_node->type == XML_ELEMENT_NODE) &&
                          !strcmp((const char *) sub_node->name, "subfield"))
                      {
-                         marchash_add_subfield(
-                             marchash, field,
-                             xmlGetProp(sub_node, BAD_CAST "code")[0],
-                             (const char *) xmlNodeGetContent(sub_node));
+                         xmlChar *content = xmlNodeGetContent(sub_node);
+                         xmlChar *code = xmlGetProp(sub_node, BAD_CAST "code");
+                         if (code && content)
+                             marchash_add_subfield(
+                                 marchash, field,
+                                 code[0], (const char *) content);
+                         xmlFree(content);
+                         xmlFree(code);
                      }
                      sub_node = sub_node->next;
                  } 
@@ -144,7 +145,7 @@ struct marcfield *marchash_add_field(struct marchash *marchash,
     struct marcfield *new;
     struct marcfield *last;
     
-    slot = hash((const unsigned char *) key) & MARCHASH_MASK;
+    slot = jenkins_hash((const unsigned char *) key) & MARCHASH_MASK;
     new = marchash->table[slot];
     last = NULL;
     
@@ -211,7 +212,7 @@ struct marcfield *marchash_get_field (struct marchash *marchash,
     if (last)
         cur = last->next;
     else 
-        cur = marchash->table[hash((const unsigned char *)key) & MARCHASH_MASK];
+        cur = marchash->table[jenkins_hash((const unsigned char *)key) & MARCHASH_MASK];
     while (cur)
     {
         if (!strcmp(cur->key, key))