X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Frelevance.c;h=bc841e4e5e18396ee988824eb57343ca545a0205;hb=f53516031317781ebb1a92691e3999de0afa72eb;hp=c7c3f126ff89a963c478fb26b33c3f436f9d5a22;hpb=77b4d51d81340f3374ae8a97aea0177a0fbcd336;p=pazpar2-moved-to-github.git

diff --git a/src/relevance.c b/src/relevance.c
index c7c3f12..bc841e4 100644
--- a/src/relevance.c
+++ b/src/relevance.c
@@ -1,5 +1,5 @@
 /*
- * $Id: relevance.c,v 1.5 2007-01-08 18:32:35 quinn Exp $
+ * $Id: relevance.c,v 1.8 2007-01-15 04:34:28 quinn Exp $
  */
 
 #include <ctype.h>
@@ -121,7 +121,7 @@ struct relevance *relevance_create(NMEM nmem, const char **terms, int numrecs)
         ;
     res->vec_len = ++i;
     res->doc_frequency_vec = nmem_malloc(nmem, res->vec_len * sizeof(int));
-    bzero(res->doc_frequency_vec, res->vec_len * sizeof(int));
+    memset(res->doc_frequency_vec, 0, res->vec_len * sizeof(int));
     res->nmem = nmem;
     res->wt = build_word_trie(nmem, terms);
     return res;
@@ -132,7 +132,7 @@ void relevance_newrec(struct relevance *r, struct record_cluster *rec)
     if (!rec->term_frequency_vec)
     {
         rec->term_frequency_vec = nmem_malloc(r->nmem, r->vec_len * sizeof(int));
-        bzero(rec->term_frequency_vec, r->vec_len * sizeof(int));
+        memset(rec->term_frequency_vec, 0, r->vec_len * sizeof(int));
     }
 }
 
@@ -177,6 +177,7 @@ void relevance_donerecord(struct relevance *r, struct record_cluster *cluster)
     r->doc_frequency_vec[0]++;
 }
 
+#ifdef GAGA
 #ifdef FLOAT_REL
 static int comp(const void *p1, const void *p2)
 {
@@ -194,13 +195,14 @@ static int comp(const void *p1, const void *p2)
 #else
 static int comp(const void *p1, const void *p2)
 {
-    struct record **r1 = (struct record **) p1;
-    struct record **r2 = (struct record **) p2;
+    struct record_cluster **r1 = (struct record_cluster **) p1;
+    struct record_cluster **r2 = (struct record_cluster **) p2;
     return (*r2)->relevance - (*r1)->relevance;
 }
 #endif
+#endif
 
-// Prepare for a relevance-sorted read of up to num entries
+// Prepare for a relevance-sorted read
 void relevance_prepare_read(struct relevance *rel, struct reclist *reclist)
 {
     int i;
@@ -231,7 +233,9 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist)
         }
         rec->relevance = (int) (relevance * 100000);
     }
+#ifdef GAGA
     qsort(reclist->flatlist, reclist->num_records, sizeof(struct record*), comp);
+#endif
     reclist->pointer = 0;
     xfree(idfvec);
 }