/*
- * $Id: termlists.c,v 1.3 2007-01-08 18:32:35 quinn Exp $
+ * $Id: termlists.c,v 1.5 2007-01-15 19:01:15 quinn Exp $
*/
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include <yaz/yaz-util.h>
#if HAVE_CONFIG_H
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
{
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);
+ for (cp = buf + strlen(buf) - 1; cp > buf &&
+ (*cp == ',' || *cp == '.' || *cp == ' '); cp--)
+ *cp = '\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));
{
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;