X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frank1.c;h=2c603d2435df9544f1af611374ce57c473da2bb9;hb=131e8143a9b8da294d582f0793833679101a2672;hp=0df8d8900c06475842cb2f1481560fa70bbaaefc;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git diff --git a/index/rank1.c b/index/rank1.c index 0df8d89..2c603d2 100644 --- a/index/rank1.c +++ b/index/rank1.c @@ -1,5 +1,5 @@ -/* $Id: rank1.c,v 1.22 2005-01-15 19:38:26 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: rank1.c,v 1.32 2007-01-15 15:10:16 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -15,24 +15,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 #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #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; @@ -56,9 +57,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; @@ -75,10 +78,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; } @@ -91,7 +94,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); } @@ -109,7 +112,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; @@ -127,8 +130,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)++; } @@ -137,11 +140,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; } @@ -152,7 +155,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 */ } @@ -169,14 +172,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); } @@ -186,13 +189,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++) { @@ -204,7 +208,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 */ @@ -241,4 +245,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 + */ +