More type casts due to zint.

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

diff --git a/index/rank1.c b/index/rank1.c
index f233fe3..2117704 100644 (file)
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -1,5 +1,5 @@
-/* $Id: rank1.c,v 1.12 2003-01-13 22:45:22 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rank1.c,v 1.16 2004-08-06 13:36:23 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -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;
@@ -65,7 +65,7 @@ static int log2_int (unsigned g)
  * create: Creates/Initialises this rank handler. This routine is 
  *  called exactly once. The routine returns the class_handle.
  */
-static void *create (struct zebra_register *reg)
+static void *create (ZebraHandle zh)
 {
     struct rank_class_info *ci = (struct rank_class_info *)
        xmalloc (sizeof(*ci));
@@ -107,16 +107,21 @@ static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
        xmalloc (sizeof(*si->entries)*si->no_entries);
     for (i = 0; i < si->no_entries; i++)
     {
-       int g = rset->rset_terms[i]->nn;
+       zint g = rset->rset_terms[i]->nn;
 #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))
        {
+            const char *cp = strstr(rset->rset_terms[i]->flags+4, ",w=");
            si->entries[i].rank_flag = 1;
-            si->entries[i].rank_weight = atoi (rset->rset_terms[i]->flags+5);
+            if (cp)
+                si->entries[i].rank_weight = atoi (cp+3);
+            else
+                si->entries[i].rank_weight = 34;
 #if DEBUG_RANK
-            yaz_log (LOG_LOG, " weight=%d", i, si->entries[i].rank_weight);
+            yaz_log (LOG_LOG, " i=%d weight=%d", i,
+                     si->entries[i].rank_weight);
 #endif
            (si->no_rank_entries)++;
        }
@@ -125,7 +130,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, "-------- %d ------", 32 - log2_int (g));
+       yaz_log (LOG_DEBUG, " global_inv = %d g = " ZINT_FORMAT, (int) (32-log2_int (g)), g);
     }
     return si;
 }
@@ -163,7 +168,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;
@@ -187,7 +192,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;