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
Swap functions - minor changes to compare tst function
[idzebra-moved-to-github.git]
/
index
/
rank1.c
diff --git
a/index/rank1.c
b/index/rank1.c
index
581e78a
..
c79edea
100644
(file)
--- a/
index/rank1.c
+++ b/
index/rank1.c
@@
-1,5
+1,5
@@
-/* $Id: rank1.c,v 1.18 2004-10-26 15:32:11 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: rank1.c,v 1.21 2004-11-29 21:55:25 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-20,8
+20,6
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#include <stdio.h>
#include <assert.h>
#ifdef WIN32
#include <stdio.h>
#include <assert.h>
#ifdef WIN32
@@
-30,10
+28,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-#define DEBUG_RANK 1
#include "index.h"
#include "index.h"
+static int log_level=0;
+static int log_initialized=0;
+
struct rank_class_info {
int dummy;
};
struct rank_class_info {
int dummy;
};
@@
-73,7
+73,12
@@
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));
- yaz_log (LOG_DEBUG, "rank-1 create");
+ if (!log_initialized)
+ {
+ log_level=yaz_log_module_level("rank1");
+ log_initialized=1;
+ }
+ yaz_log (log_level, "rank-1 create");
return ci;
}
return ci;
}
@@
-86,7
+91,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;
- yaz_log (LOG_DEBUG, "rank-1 destroy");
+ yaz_log (log_level, "rank-1 destroy");
xfree (ci);
}
xfree (ci);
}
@@
-104,9
+109,7
@@
static void *begin (struct zebra_register *reg,
(struct rank_set_info *) nmem_malloc (nmem,sizeof(*si));
int i;
(struct rank_set_info *) nmem_malloc (nmem,sizeof(*si));
int i;
-#if DEBUG_RANK
- yaz_log (LOG_LOG, "rank-1 begin");
-#endif
+ yaz_log (log_level, "rank-1 begin");
si->no_entries = numterms;
si->no_rank_entries = 0;
si->nmem=nmem;
si->no_entries = numterms;
si->no_rank_entries = 0;
si->nmem=nmem;
@@
-115,10
+118,8
@@
static void *begin (struct zebra_register *reg,
for (i = 0; i < numterms; i++)
{
zint g = rset_count(terms[i]->rset);
for (i = 0; i < numterms; i++)
{
zint g = rset_count(terms[i]->rset);
-#if DEBUG_RANK
- yaz_log(LOG_LOG, "i=%d flags=%s '%s'", i,
+ yaz_log(log_level, "i=%d flags=%s '%s'", i,
terms[i]->flags, terms[i]->name );
terms[i]->flags, terms[i]->name );
-#endif
if (!strncmp (terms[i]->flags, "rank,", 5))
{
const char *cp = strstr(terms[i]->flags+4, ",w=");
if (!strncmp (terms[i]->flags, "rank,", 5))
{
const char *cp = strstr(terms[i]->flags+4, ",w=");
@@
-127,10
+128,8
@@
static void *begin (struct zebra_register *reg,
si->entries[i].rank_weight = atoi (cp+3);
else
si->entries[i].rank_weight = 34;
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 g="ZINT_FORMAT, i,
+ yaz_log (log_level, " i=%d weight=%d g="ZINT_FORMAT, i,
si->entries[i].rank_weight, g);
si->entries[i].rank_weight, g);
-#endif
(si->no_rank_entries)++;
}
else
(si->no_rank_entries)++;
}
else
@@
-138,7
+137,7
@@
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);
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_DEBUG, " 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_index=i;
(int) (32-log2_int (g)), g);
si->entries[i].term=terms[i];
si->entries[i].term_index=i;
@@
-153,7
+152,7
@@
static void *begin (struct zebra_register *reg,
*/
static void end (struct zebra_register *reg, void *set_handle)
{
*/
static void end (struct zebra_register *reg, void *set_handle)
{
- yaz_log (LOG_DEBUG, "rank-1 end");
+ yaz_log (log_level, "rank-1 end");
/* no need to free anything, they are in nmems */
}
/* no need to free anything, they are in nmems */
}
@@
-166,15
+165,19
@@
static void end (struct zebra_register *reg, void *set_handle)
static void add (void *set_handle, int seqno, TERMID term)
{
struct rank_set_info *si = (struct rank_set_info *) set_handle;
static void add (void *set_handle, int seqno, TERMID term)
{
struct rank_set_info *si = (struct rank_set_info *) set_handle;
- struct rank_term_info *ti= (struct rank_term_info *) term->rankpriv;
+ struct rank_term_info *ti;
assert(si);
assert(si);
- assert(term);
+ if (!term)
+ {
+ yaz_log (log_level, "rank-1 add NULL term");
+ return;
+ }
+ ti= (struct rank_term_info *) term->rankpriv;
assert(ti);
assert(ti);
-#if DEBUG_RANK
- yaz_log (LOG_LOG, "rank-1 add seqno=%d term=%s", seqno, term->name);
-#endif
si->last_pos = seqno;
ti->local_occur++;
si->last_pos = seqno;
ti->local_occur++;
+ yaz_log (log_level, "rank-1 add seqno=%d term=%s count=%d",
+ seqno, term->name,ti->local_occur);
}
/*
}
/*
@@
-191,26
+194,20
@@
static int calc (void *set_handle, zint sysno)
if (!si->no_rank_entries)
return -1;
if (!si->no_rank_entries)
return -1;
-#if DEBUG_RANK
- 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, "calc: i=%d rank_flag=%d lo=%d",
+ yaz_log(log_level, "calc: i=%d rank_flag=%d lo=%d",
i, si->entries[i].rank_flag, si->entries[i].local_occur);
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;
-#if DEBUG_RANK
- yaz_log (LOG_LOG, "calc sysno=" ZINT_FORMAT " score=%d", sysno, score);
-#endif
+ yaz_log (log_level, "calc sysno=" ZINT_FORMAT " score=%d", sysno, score);
if (score > 1000)
score = 1000;
if (score > 1000)
score = 1000;
+ /* reset the counts for the next term */
for (i = 0; i < si->no_entries; i++)
si->entries[i].local_occur = 0;
return score;
for (i = 0; i < si->no_entries; i++)
si->entries[i].local_occur = 0;
return score;