X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Ftermlists.c;h=52c22d2b4e7cf486f5d9e057843863419dba3684;hb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;hp=6c8549597d9dde33301c5fa7737a20acd892edc2;hpb=77b4d51d81340f3374ae8a97aea0177a0fbcd336;p=pazpar2-moved-to-github.git

diff --git a/src/termlists.c b/src/termlists.c
index 6c85495..52c22d2 100644
--- a/src/termlists.c
+++ b/src/termlists.c
@@ -1,9 +1,25 @@
-/*
- * $Id: termlists.c,v 1.3 2007-01-08 18:32:35 quinn Exp $
- */
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <yaz/yaz-util.h>
 
 #if HAVE_CONFIG_H
@@ -69,7 +85,7 @@ struct termlist *termlist_create(NMEM nmem, int numterms, int highscore_size)
         hashsize <<= 1;
     res = nmem_malloc(nmem, sizeof(struct termlist));
     res->hashtable = nmem_malloc(nmem, hashsize * sizeof(struct termlist_bucket*));
-    bzero(res->hashtable, hashsize * sizeof(struct termlist_bucket*));
+    memset(res->hashtable, 0, hashsize * sizeof(struct termlist_bucket*));
     res->hashtable_size = hashsize;
     res->nmem = nmem;
     res->hashmask = hashsize - 1; // Creates a bitmask
@@ -124,11 +140,19 @@ void termlist_insert(struct termlist *tl, const char *term)
 {
     unsigned int bucket;
     struct termlist_bucket **p;
+    char buf[256], *cp;
 
-    bucket = hash((unsigned char *)term) & tl->hashmask;
+    if (strlen(term) > 255)
+        return;
+    strcpy(buf, term);
+    /* chop right */
+    for (cp = buf + strlen(buf); cp != buf && strchr(",. -", cp[-1]); cp--)
+        cp[-1] = '\0';
+    
+    bucket = hash((unsigned char *)buf) & tl->hashmask;
     for (p = &tl->hashtable[bucket]; *p; p = &(*p)->next)
     {
-        if (!strcmp(term, (*p)->term.term))
+        if (!strcmp(buf, (*p)->term.term))
         {
             (*p)->term.frequency++;
             update_highscore(tl, &((*p)->term));
@@ -139,7 +163,7 @@ void termlist_insert(struct termlist *tl, const char *term)
     {
         struct termlist_bucket *new = nmem_malloc(tl->nmem,
                 sizeof(struct termlist_bucket));
-        new->term.term = nmem_strdup(tl->nmem, term);
+        new->term.term = nmem_strdup(tl->nmem, buf);
         new->term.frequency = 1;
         new->next = 0;
         *p = new;