X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=ec3831dd43f823a6709e8854a19cf8a1e7a79c78;hb=2b99f08490d3bd763bb086693044a6db10c0bcf9;hp=76d3e7d8a1eb0a809b4e68ecb739ac7382a549a4;hpb=8c2b1cb07e43a08cf1e0ac844c81d4e066eacf23;p=idzebra-moved-to-github.git diff --git a/rset/rsbool.c b/rset/rsbool.c index 76d3e7d..ec3831d 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,4 +1,4 @@ -/* $Id: rsbool.c,v 1.30 2004-06-16 20:32:07 adam Exp $ +/* $Id: rsbool.c,v 1.36 2004-08-06 12:28:23 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -25,8 +25,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include #include +#include +#include #ifndef RSET_DEBUG #define RSET_DEBUG 0 @@ -40,7 +41,7 @@ static void r_rewind (RSFD rfd); static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, int (*cmpfunc)(const void *p1, const void *p2), const void *untilbuf); -static int r_count (RSET ct); +static void r_pos (RSFD rfd, double *current, double *total); static int r_read_and (RSFD rfd, void *buf, int *term_index); static int r_read_or (RSFD rfd, void *buf, int *term_index); static int r_read_not (RSFD rfd, void *buf, int *term_index); @@ -55,7 +56,7 @@ static const struct rset_control control_and = r_delete, r_rewind, r_forward, /* rset_default_forward, */ - r_count, + r_pos, /* rset_default_pos */ r_read_and, r_write, }; @@ -68,12 +69,8 @@ static const struct rset_control control_or = r_close, r_delete, r_rewind, -#if 1 r_forward, -#else - rset_default_forward, -#endif - r_count, + r_pos, r_read_or, r_write, }; @@ -87,7 +84,7 @@ static const struct rset_control control_not = r_delete, r_rewind, r_forward, - r_count, + r_pos, r_read_not, r_write, }; @@ -108,6 +105,7 @@ struct rset_bool_info { }; struct rset_bool_rfd { + zint hits; RSFD rfd_l; RSFD rfd_r; int more_l; @@ -165,6 +163,7 @@ static RSFD r_open (RSET ct, int flag) rfd->next = info->rfd_list; info->rfd_list = rfd; rfd->info = info; + rfd->hits=0; rfd->buf_l = xmalloc (info->key_size); rfd->buf_r = xmalloc (info->key_size); @@ -219,6 +218,7 @@ static void r_rewind (RSFD rfd) rset_rewind (info->rset_r, p->rfd_r); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l); p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r); + p->hits=0; } static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, @@ -257,11 +257,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, return rc; } -static int r_count (RSET ct) -{ - return 0; -} - /* 1,1 1,3 @@ -320,6 +315,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) key_logdump(LOG_DEBUG,buf); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else if (cmp == -1) @@ -334,6 +330,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) rfd, p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else if (cmp > 1) /* cmp == 2 */ @@ -354,6 +351,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } #else @@ -371,6 +369,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) rfd, p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else @@ -405,6 +404,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) rfd, p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } #else @@ -421,6 +421,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) rfd, p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else @@ -475,6 +476,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else if (cmp > 0) @@ -488,6 +490,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else @@ -501,6 +504,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) p->more_l, p->more_r, cmp); (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } } @@ -528,20 +532,16 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index) *term_index = p->term_index_l; p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l); + p->hits++; return 1; } else if (cmp > 1) - { -#if 0 - p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, - &p->term_index_r); -#else - p->more_r = rset_forward( - info->rset_r, p->rfd_r, - p->buf_r, &p->term_index_r, - (info->cmp), p->buf_l); -#endif - } + { + p->more_r = rset_forward( + info->rset_r, p->rfd_r, + p->buf_r, &p->term_index_r, + (info->cmp), p->buf_l); + } else { memcpy (buf, p->buf_l, info->key_size); @@ -573,3 +573,33 @@ static int r_write (RSFD rfd, const void *buf) return -1; } +static void r_pos (RSFD rfd, double *current, double *total) +{ + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; + struct rset_bool_info *info = p->info; + double lcur,ltot; + double rcur,rtot; + double r; + ltot=-1; rtot=-1; + rset_pos(info->rset_l, p->rfd_l, &lcur, <ot); + rset_pos(info->rset_r, p->rfd_r, &rcur, &rtot); + if ( (rtot<0) && (ltot<0)) { /*no position */ + *current=rcur; /* return same as you got */ + *total=rtot; /* probably -1 for not available */ + } + if ( rtot<0) { rtot=0; rcur=0;} /* if only one useful, use it */ + if ( ltot<0) { ltot=0; lcur=0;} + if ( rtot+ltot < 1 ) { /* empty rset */ + *current=0; + *total=0; + return; + } + r=1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */ + *current=(double) (p->hits); + *total=*current/r ; +#if RSET_DEBUG + yaz_log(LOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ", + info->rset_l->control->desc, info->rset_r->control->desc, + *current, *total, r); +#endif +}