Do not use readdir_r

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

diff --git a/index/rank1.c b/index/rank1.c
index 48a4ada..1d12085 100644 (file)
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -1,38 +1,26 @@
-/*
- * Copyright (C) 1998-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rank1.c,v $
- * Revision 1.9  2002-04-11 11:39:59  heikki
- * Removed to logf calls from tight inside loops
- *
- * Revision 1.8  2002/04/04 14:14:13  adam
- * Multiple registers (alpha early)
- *
- * Revision 1.7  2001/11/14 22:06:27  adam
- * Rank-weight may be controlled via query.
- *
- * Revision 1.6  2000/03/15 15:00:30  adam
- * First work on threaded version.
- *
- * Revision 1.5  1999/05/26 07:49:13  adam
- * C++ compilation.
- *
- * Revision 1.4  1999/02/02 14:51:01  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.3  1998/06/12 12:21:53  adam
- * Fixed memory-leak.
- *
- * Revision 1.2  1998/03/05 13:03:29  adam
- * Improved ranking.
- *
- * Revision 1.1  1998/03/05 08:45:12  adam
- * New result set model and modular ranking system. Moved towards
- * descent server API. System information stored as "SGML" records.
- *
- */
+/* $Id: rank1.c,v 1.11 2003-01-13 22:37:12 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 
 #include <stdio.h>
 #include <assert.h>
@@ -108,7 +96,7 @@ static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
     struct rank_set_info *si = (struct rank_set_info *) xmalloc (sizeof(*si));
     int i;
 
-    logf (LOG_DEBUG, "rank-1 begin");
+    logf (LOG_LOG, "rank-1 begin");
     si->no_entries = rset->no_rset_terms;
     si->no_rank_entries = 0;
     si->entries = (struct rank_term_info *)
@@ -116,12 +104,12 @@ static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
     for (i = 0; i < si->no_entries; i++)
     {
        int g = rset->rset_terms[i]->nn;
+        yaz_log(LOG_LOG, "i=%d flags=%s", i, rset->rset_terms[i]->flags);
        if (!strncmp (rset->rset_terms[i]->flags, "rank,", 5))
        {
-            yaz_log (LOG_LOG, "%s", rset->rset_terms[i]->flags);
            si->entries[i].rank_flag = 1;
             si->entries[i].rank_weight = atoi (rset->rset_terms[i]->flags+5);
-            yaz_log (LOG_LOG, "i=%d weight=%d", i, si->entries[i].rank_weight);
+            yaz_log (LOG_LOG, " weight=%d", i, si->entries[i].rank_weight);
            (si->no_rank_entries)++;
        }
        else
@@ -154,7 +142,7 @@ static void end (struct zebra_register *reg, void *set_handle)
 static void add (void *set_handle, int seqno, int term_index)
 {
     struct rank_set_info *si = (struct rank_set_info *) set_handle;
-    /*logf (LOG_DEBUG, "rank-1 add seqno=%d term_index=%d", seqno, term_index);*/
+    yaz_log (LOG_LOG, "rank-1 add seqno=%d term_index=%d", seqno, term_index);
     si->last_pos = seqno;
     si->entries[term_index].local_occur++;
 }
@@ -173,10 +161,15 @@ static int calc (void *set_handle, int sysno)
     if (!si->no_rank_entries)
        return -1;
 
+    yaz_log(LOG_LOG, "calc");
     for (i = 0; i < si->no_entries; i++)
+    {
+        yaz_log(LOG_LOG, "i=%d rank_flag=%d lo=%d",
+                i, si->entries[i].rank_flag, si->entries[i].local_occur);
        if (si->entries[i].rank_flag && (lo = si->entries[i].local_occur))
            score += (8+log2_int (lo)) * si->entries[i].global_inv *
                 si->entries[i].rank_weight;
+    }
     divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
     score = score / divisor;
     yaz_log (LOG_LOG, "sysno=%d score=%d", sysno, score);