Automaked pazpar2. Bug #799. Preprocessor defines are put in cconfig.h and

[pazpar2-moved-to-github.git] / src / relevance.c

diff --git a/src/relevance.c b/src/relevance.c
index 2823eff..75800a2 100644 (file)
--- a/src/relevance.c
+++ b/src/relevance.c
@@ -1,11 +1,15 @@
 /*
- * $Id: relevance.c,v 1.1 2006-12-20 20:47:16 quinn Exp $
+ * $Id: relevance.c,v 1.4 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include "relevance.h"
 #include "pazpar2.h"
 
@@ -67,16 +71,16 @@ static void word_trie_addterm(NMEM nmem, struct word_trie *n, const char *term,
 
 #define raw_char(c) (((c) >= 'a' && (c) <= 'z') ? (c) - 'a' : -1)
 
-static int word_trie_match(struct word_trie *t, const char *word, int len, int *skipped)
+static int word_trie_match(struct word_trie *t, const char *word, int *skipped)
 {
     int c = raw_char(tolower(*word));
 
-    if (!len)
+    if (!*word)
         return 0;
 
-    word++; len--;
+    word++;
     (*skipped)++;
-    if (!len || raw_char(*word) < 0)
+    if (!*word || raw_char(*word) < 0)
     {
         if (t->list[c].termno > 0)
             return t->list[c].termno;
@@ -87,7 +91,7 @@ static int word_trie_match(struct word_trie *t, const char *word, int len, int *
     {
         if (t->list[c].child)
         {
-            return word_trie_match(t->list[c].child, word, len, skipped);
+            return word_trie_match(t->list[c].child, word, skipped);
         }
         else
             return 0;
@@ -136,34 +140,27 @@ void relevance_newrec(struct relevance *r, struct record *rec)
 // FIXME. The definition of a word is crude here.. should support
 // some form of localization mechanism?
 void relevance_countwords(struct relevance *r, struct record *head,
-        const char *words, int len, int multiplier)
+        const char *words, int multiplier)
 {
-    while (len)
+    while (*words)
     {
         char c;
         int res;
         int skipped;
-        while (len && (c = raw_char(tolower(*words))) < 0)
-        {
+        while (*words && (c = raw_char(tolower(*words))) < 0)
             words++;
-            len--;
-        }
-        if (!len)
+        if (!*words)
             return;
         skipped = 0;
-        if ((res = word_trie_match(r->wt, words, len, &skipped)))
+        if ((res = word_trie_match(r->wt, words, &skipped)))
         {
             words += skipped;
-            len -= skipped;
             head->term_frequency_vec[res] += multiplier;
         }
         else
         {
-            while (len && (c = raw_char(tolower(*words))) >= 0)
-            {
+            while (*words && (c = raw_char(tolower(*words))) >= 0)
                 words++;
-                len--;
-            }
         }
         head->term_frequency_vec[0]++;
     }
@@ -236,6 +233,7 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist)
     }
     qsort(reclist->flatlist, reclist->num_records, sizeof(struct record*), comp);
     reclist->pointer = 0;
+    xfree(idfvec);
 }
 
 /*