projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added several type casts and changed many types - mostly from int to zint.
[idzebra-moved-to-github.git]
/
index
/
rank1.c
diff --git
a/index/rank1.c
b/index/rank1.c
index
1d12085
..
b4de2dd
100644
(file)
--- a/
index/rank1.c
+++ b/
index/rank1.c
@@
-1,5
+1,5
@@
-/* $Id: rank1.c,v 1.11 2003-01-13 22:37:12 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rank1.c,v 1.15 2004-08-04 08:35: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.
Index Data Aps
This file is part of the Zebra server.
@@
-30,6
+30,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <unistd.h>
#endif
#include <unistd.h>
#endif
+#define DEBUG_RANK 0
+
#include "index.h"
struct rank_class_info {
#include "index.h"
struct rank_class_info {
@@
-63,12
+65,12
@@
static int log2_int (unsigned g)
* create: Creates/Initialises this rank handler. This routine is
* called exactly once. The routine returns the class_handle.
*/
* 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));
{
struct rank_class_info *ci = (struct rank_class_info *)
xmalloc (sizeof(*ci));
- logf (LOG_DEBUG, "rank-1 create");
+ yaz_log (LOG_DEBUG, "rank-1 create");
return ci;
}
return ci;
}
@@
-81,7
+83,7
@@
static void destroy (struct zebra_register *reg, void *class_handle)
{
struct rank_class_info *ci = (struct rank_class_info *) class_handle;
{
struct rank_class_info *ci = (struct rank_class_info *) class_handle;
- logf (LOG_DEBUG, "rank-1 destroy");
+ yaz_log (LOG_DEBUG, "rank-1 destroy");
xfree (ci);
}
xfree (ci);
}
@@
-96,7
+98,9
@@
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;
struct rank_set_info *si = (struct rank_set_info *) xmalloc (sizeof(*si));
int i;
- logf (LOG_LOG, "rank-1 begin");
+#if DEBUG_RANK
+ yaz_log (LOG_LOG, "rank-1 begin");
+#endif
si->no_entries = rset->no_rset_terms;
si->no_rank_entries = 0;
si->entries = (struct rank_term_info *)
si->no_entries = rset->no_rset_terms;
si->no_rank_entries = 0;
si->entries = (struct rank_term_info *)
@@
-104,12
+108,21
@@
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;
for (i = 0; i < si->no_entries; i++)
{
int g = rset->rset_terms[i]->nn;
+#if DEBUG_RANK
yaz_log(LOG_LOG, "i=%d flags=%s", i, rset->rset_terms[i]->flags);
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 (!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_flag = 1;
- si->entries[i].rank_weight = atoi (rset->rset_terms[i]->flags+5);
- yaz_log (LOG_LOG, " weight=%d", i, si->entries[i].rank_weight);
+ if (cp)
+ si->entries[i].rank_weight = atoi (cp+3);
+ else
+ si->entries[i].rank_weight = 34;
+#if DEBUG_RANK
+ yaz_log (LOG_LOG, " i=%d weight=%d", i,
+ si->entries[i].rank_weight);
+#endif
(si->no_rank_entries)++;
}
else
(si->no_rank_entries)++;
}
else
@@
-117,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);
si->entries[i].local_occur = 0;
si->entries[i].global_occur = g;
si->entries[i].global_inv = 32 - log2_int (g);
- logf (LOG_DEBUG, "-------- %d ------", 32 - log2_int (g));
+ yaz_log (LOG_DEBUG, " global_inv = %d g = %d", 32 - log2_int (g), g);
}
return si;
}
}
return si;
}
@@
-129,7
+142,7
@@
static void *begin (struct zebra_register *reg, void *class_handle, RSET rset)
static void end (struct zebra_register *reg, void *set_handle)
{
struct rank_set_info *si = (struct rank_set_info *) set_handle;
static void end (struct zebra_register *reg, void *set_handle)
{
struct rank_set_info *si = (struct rank_set_info *) set_handle;
- logf (LOG_DEBUG, "rank-1 end");
+ yaz_log (LOG_DEBUG, "rank-1 end");
xfree (si->entries);
xfree (si);
}
xfree (si->entries);
xfree (si);
}
@@
-142,7
+155,9
@@
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;
static void add (void *set_handle, int seqno, int term_index)
{
struct rank_set_info *si = (struct rank_set_info *) set_handle;
+#if DEBUG_RANK
yaz_log (LOG_LOG, "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);
+#endif
si->last_pos = seqno;
si->entries[term_index].local_occur++;
}
si->last_pos = seqno;
si->entries[term_index].local_occur++;
}
@@
-153,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.
*/
* 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;
{
int i, lo, divisor, score = 0;
struct rank_set_info *si = (struct rank_set_info *) set_handle;
@@
-161,18
+176,24
@@
static int calc (void *set_handle, int sysno)
if (!si->no_rank_entries)
return -1;
if (!si->no_rank_entries)
return -1;
+#if DEBUG_RANK
yaz_log(LOG_LOG, "calc");
yaz_log(LOG_LOG, "calc");
+#endif
for (i = 0; i < si->no_entries; i++)
{
for (i = 0; i < si->no_entries; i++)
{
+#if DEBUG_RANK
yaz_log(LOG_LOG, "i=%d rank_flag=%d lo=%d",
i, si->entries[i].rank_flag, si->entries[i].local_occur);
yaz_log(LOG_LOG, "i=%d rank_flag=%d lo=%d",
i, si->entries[i].rank_flag, si->entries[i].local_occur);
+#endif
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;
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);
+#if DEBUG_RANK
+ yaz_log (LOG_LOG, "sysno=" ZINT_FORMAT " score=%d", sysno, score);
+#endif
if (score > 1000)
score = 1000;
for (i = 0; i < si->no_entries; i++)
if (score > 1000)
score = 1000;
for (i = 0; i < si->no_entries; i++)