Do not declare static function f in AC_TRY_LINK test

[idzebra-moved-to-github.git] / index / rank1.c

diff --git a/index/rank1.c b/index/rank1.c
index 9ad92a6..05f0761 100644 (file)
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -1,5 +1,5 @@
-/* $Id: rank1.c,v 1.13 2003-03-26 16:41:48 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rank1.c,v 1.17 2004-08-20 14:44:46 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -30,7 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <unistd.h>
 #endif
 
-#define DEBUG_RANK 1
+#define DEBUG_RANK 0
 
 #include "index.h"
 
@@ -40,7 +40,7 @@ struct rank_class_info {
 
 struct rank_term_info {
     int local_occur;
-    int global_occur;
+    zint global_occur;
     int global_inv;
     int rank_flag;
     int rank_weight;
@@ -101,19 +101,24 @@ static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
 #if DEBUG_RANK
     yaz_log (LOG_LOG, "rank-1 begin");
 #endif
-    si->no_entries = rset->no_rset_terms;
+    si->no_entries = 0; /* rset->no_rset_terms; */ /* FIXME - what to do here*/
+       /* Now that we don't count term occurrences, ranking will have to */
+       /* different! */
     si->no_rank_entries = 0;
     si->entries = (struct rank_term_info *)
        xmalloc (sizeof(*si->entries)*si->no_entries);
     for (i = 0; i < si->no_entries; i++)
     {
-       int g = rset->rset_terms[i]->nn;
+       zint g = 0; /* rset->rset_terms[i]->nn; */ /* FIXME ??? */
 #if DEBUG_RANK
         yaz_log(LOG_LOG, "i=%d flags=%s", i, rset->rset_terms[i]->flags);
 #endif
-       if (!strncmp (rset->rset_terms[i]->flags, "rank,", 5))
+       if (0) /* (!strncmp (rset->rset_terms[i]->flags, "rank,", 5)) */
+               /* FIXME */ /* ??? */
        {
-            const char *cp = strstr(rset->rset_terms[i]->flags+4, ",w=");
+            const char *cp = "w"; 
+                         /*= strstr(rset->rset_terms[i]->flags+4, ",w=");*/
+                         /* FIXME ??? */
            si->entries[i].rank_flag = 1;
             if (cp)
                 si->entries[i].rank_weight = atoi (cp+3);
@@ -130,7 +135,7 @@ static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
        si->entries[i].local_occur = 0;
        si->entries[i].global_occur = g;
        si->entries[i].global_inv = 32 - log2_int (g);
-       yaz_log (LOG_DEBUG, " global_inv = %d g = %d", 32 - log2_int (g), g);
+       yaz_log (LOG_DEBUG, " global_inv = %d g = " ZINT_FORMAT, (int) (32-log2_int (g)), g);
     }
     return si;
 }
@@ -168,7 +173,7 @@ static void add (void *set_handle, int seqno, int term_index)
  *  score should be between 0 and 1000. If score cannot be obtained
  *  -1 should be returned.
  */
-static int calc (void *set_handle, int sysno)
+static int calc (void *set_handle, zint sysno)
 {
     int i, lo, divisor, score = 0;
     struct rank_set_info *si = (struct rank_set_info *) set_handle;
@@ -192,7 +197,7 @@ static int calc (void *set_handle, int sysno)
     divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
     score = score / divisor;
 #if DEBUG_RANK
-    yaz_log (LOG_LOG, "sysno=%d score=%d", sysno, score);
+    yaz_log (LOG_LOG, "sysno=" ZINT_FORMAT " score=%d", sysno, score);
 #endif
     if (score > 1000)
        score = 1000;