Omit CVS Id. Update copyright year.

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

diff --git a/index/rank1.c b/index/rank1.c
index df7b7c1..b6a20d4 100644 (file)
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -1,8 +1,5 @@
-/* $Id: rank1.c,v 1.20 2004-11-04 13:09:06 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,26 +12,25 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
-
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
 #include <stdio.h>
 #include <assert.h>
 #ifdef WIN32
 #include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-
 #include "index.h"
+#include "rank.h"
 
-static int log_level=0;
-static int log_initialized=0;
+static int log_level = 0;
+static int log_initialized = 0;
 
 struct rank_class_info {
     int dummy;
@@ -58,9 +54,11 @@ struct rank_set_info {
     NMEM nmem;
 };
 
-static int log2_int (unsigned g)
+static int log2_int (zint g)
 {
     int n = 0;
+    if (g < 0)
+       return 0;
     while ((g = g>>1))
        n++;
     return n;
@@ -77,10 +75,10 @@ static void *create (ZebraHandle zh)
 
     if (!log_initialized)
     {
-        log_level=yaz_log_module_level("rank1");
-        log_initialized=1;
+        log_level = yaz_log_module_level("rank1");
+        log_initialized = 1;
     }
-    yaz_log (log_level, "rank-1 create");
+    yaz_log(log_level, "rank-1 create");
     return ci;
 }
 
@@ -93,7 +91,7 @@ static void destroy (struct zebra_register *reg, void *class_handle)
 {
     struct rank_class_info *ci = (struct rank_class_info *) class_handle;
 
-    yaz_log (log_level, "rank-1 destroy");
+    yaz_log(log_level, "rank-1 destroy");
     xfree (ci);
 }
 
@@ -111,7 +109,7 @@ static void *begin (struct zebra_register *reg,
         (struct rank_set_info *) nmem_malloc (nmem,sizeof(*si));
     int i;
 
-    yaz_log (log_level, "rank-1 begin");
+    yaz_log(log_level, "rank-1 begin");
     si->no_entries = numterms;
     si->no_rank_entries = 0;
     si->nmem=nmem;
@@ -129,8 +127,8 @@ static void *begin (struct zebra_register *reg,
             if (cp)
                 si->entries[i].rank_weight = atoi (cp+3);
             else
-                si->entries[i].rank_weight = 34;
-            yaz_log (log_level, " i=%d weight=%d g="ZINT_FORMAT, i,
+              si->entries[i].rank_weight = 34; /* sqrroot of 1000 */
+            yaz_log(log_level, " i=%d weight=%d g="ZINT_FORMAT, i,
                      si->entries[i].rank_weight, g);
            (si->no_rank_entries)++;
        }
@@ -139,11 +137,11 @@ static void *begin (struct zebra_register *reg,
        si->entries[i].local_occur = 0;  /* FIXME */
        si->entries[i].global_occur = g;
        si->entries[i].global_inv = 32 - log2_int (g);
-       yaz_log (log_level, " global_inv = %d g = " ZINT_FORMAT, 
+       yaz_log(log_level, " global_inv = %d g = " ZINT_FORMAT, 
                 (int) (32-log2_int (g)), g);
-        si->entries[i].term=terms[i];
+        si->entries[i].term = terms[i];
         si->entries[i].term_index=i;
-        terms[i]->rankpriv=&(si->entries[i]);
+        terms[i]->rankpriv = &(si->entries[i]);
     }
     return si;
 }
@@ -154,7 +152,7 @@ static void *begin (struct zebra_register *reg,
  */
 static void end (struct zebra_register *reg, void *set_handle)
 {
-    yaz_log (log_level, "rank-1 end");
+    yaz_log(log_level, "rank-1 end");
     /* no need to free anything, they are in nmems */
 }
 
@@ -171,14 +169,14 @@ static void add (void *set_handle, int seqno, TERMID term)
     assert(si);
     if (!term)
     {
-        yaz_log (log_level, "rank-1 add NULL term");
+        yaz_log(log_level, "rank-1 add NULL term");
         return;
     }
     ti= (struct rank_term_info *) term->rankpriv;
     assert(ti);
     si->last_pos = seqno;
     ti->local_occur++;
-    yaz_log (log_level, "rank-1 add seqno=%d term=%s count=%d", 
+    yaz_log(log_level, "rank-1 add seqno=%d term=%s count=%d", 
             seqno, term->name,ti->local_occur);
 }
 
@@ -188,13 +186,14 @@ static void add (void *set_handle, int seqno, TERMID term)
  *  score should be between 0 and 1000. If score cannot be obtained
  *  -1 should be returned.
  */
-static int calc (void *set_handle, zint sysno)
+static int calc (void *set_handle, zint sysno, zint staticrank,
+                int *stop_flag)
 {
     int i, lo, divisor, score = 0;
     struct rank_set_info *si = (struct rank_set_info *) set_handle;
 
-    if (!si->no_rank_entries)
-       return -1;
+    if (!si->no_rank_entries) 
+       return -1;   /* ranking not enabled for any terms */
 
     for (i = 0; i < si->no_entries; i++)
     {
@@ -206,7 +205,7 @@ static int calc (void *set_handle, zint sysno)
     }
     divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
     score = score / divisor;
-    yaz_log (log_level, "calc sysno=" ZINT_FORMAT " score=%d", sysno, score);
+    yaz_log(log_level, "calc sysno=" ZINT_FORMAT " score=%d", sysno, score);
     if (score > 1000)
        score = 1000;
     /* reset the counts for the next term */
@@ -243,4 +242,12 @@ static struct rank_control rank_control = {
     add,
 };
  
-struct rank_control *rank1_class = &rank_control;
+struct rank_control *rank_1_class = &rank_control;
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+