X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=bc1a6ddb6ae9321420928f8babafb8bb46e473af;hb=4da0cd2978c9a902be772e95302e6522175402fd;hp=b14cc37083e382f3f14c0971e55d977020857235;hpb=152a0ee011a478b0ee8c3ba4045bdd707e702d0b;p=idzebra-moved-to-github.git diff --git a/rset/rsbool.c b/rset/rsbool.c index b14cc37..bc1a6dd 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,4 +1,4 @@ -/* $Id: rsbool.c,v 1.27 2004-06-01 15:22:58 adam Exp $ +/* $Id: rsbool.c,v 1.34 2004-08-06 09:43:03 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -25,11 +25,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include #include - -/* for key_logdump. Debugging only */ -#include <../index/index.h> +#include +#include #ifndef RSET_DEBUG #define RSET_DEBUG 0 @@ -43,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, zint *current, zint *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); @@ -58,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, }; @@ -71,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, }; @@ -90,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, }; @@ -106,10 +100,12 @@ struct rset_bool_info { RSET rset_r; int term_index_s; int (*cmp)(const void *p1, const void *p2); + void (*log_item)(int logmask, const void *p, const char *txt); struct rset_bool_rfd *rfd_list; }; struct rset_bool_rfd { + zint hits; RSFD rfd_l; RSFD rfd_r; int more_l; @@ -135,6 +131,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r)) ct->flags |= RSET_FLAG_VOLATILE; info->cmp = bool_parms->cmp; + info->log_item = bool_parms->log_item; info->rfd_list = NULL; info->term_index_s = info->rset_l->no_rset_terms; @@ -166,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); @@ -220,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, @@ -228,7 +227,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, { struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info; struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; - int cmp=0; int rc; #if RSET_DEBUG @@ -257,37 +255,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, rfd, rc, p->more_l, p->more_r); #endif return rc; - - if (p->more_l && p->more_r) - cmp = (*info->cmp)(p->buf_l, p->buf_r); - else if (p->more_l) - cmp = -2; - else - cmp = 2; - if ( (cmp<0) && (p->more_l) ) - { - memcpy (buf, p->buf_l, info->key_size); - *term_index = p->term_index_l; -#if RSET_DEBUG - logf (LOG_DEBUG, "rsbool_forward returning L (cmp=%d)",cmp); -#endif - return 1; - } else if ( (cmp>0) && (p->more_r) ) - { - memcpy (buf, p->buf_r, info->key_size); - *term_index = p->term_index_r + info->term_index_s; -#if RSET_DEBUG - logf (LOG_DEBUG, "rsbool_forward returning R (cmp=%d)",cmp); -#endif - return 1; - } - /* return ( p->more_l || p->more_r); */ - return 0; -} - -static int r_count (RSET ct) -{ - return 0; } @@ -311,6 +278,8 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; + { zint cur,tot; r_pos(rfd, &cur, &tot); } + while (p->more_l || p->more_r) { int cmp; @@ -324,8 +293,8 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d", rfd, p->more_l, p->more_r, cmp, p->tail); - key_logdump(LOG_DEBUG,p->buf_l); - key_logdump(LOG_DEBUG,p->buf_r); + (*info->log_item)(LOG_DEBUG, p->buf_l, "left "); + (*info->log_item)(LOG_DEBUG, p->buf_r, "right "); #endif if (!cmp) { @@ -346,7 +315,9 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) logf (LOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d", rfd, p->more_l, p->more_r, cmp); key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else if (cmp == -1) @@ -359,8 +330,9 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d", rfd, p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else if (cmp > 1) /* cmp == 2 */ @@ -379,8 +351,9 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and returning C m=%d/%d c=%d", p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } #else @@ -396,10 +369,12 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d", rfd, p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; - } else + } + else { #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and [%p] about to forward R m=%d/%d c=%d", @@ -429,8 +404,9 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d", rfd, p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } #else @@ -445,8 +421,9 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d", rfd, p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else @@ -478,6 +455,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; + { zint cur,tot; r_pos(rfd, &cur, &tot); } while (p->more_l || p->more_r) { int cmp; @@ -499,8 +477,9 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d", p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else if (cmp > 0) @@ -512,8 +491,9 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d", p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } else @@ -525,8 +505,9 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) #if RSET_DEBUG logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d", p->more_l, p->more_r, cmp); - key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); #endif + p->hits++; return 1; } } @@ -538,6 +519,7 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index) struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; + { zint cur,tot; r_pos(rfd, &cur, &tot); } while (p->more_l || p->more_r) { int cmp; @@ -554,18 +536,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); @@ -597,3 +577,33 @@ static int r_write (RSFD rfd, const void *buf) return -1; } +static void r_pos (RSFD rfd, zint *current, zint *total) +{ + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; + struct rset_bool_info *info = p->info; + zint lcur,ltot; + zint rcur,rtot; + float 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 == 0 ) { /* empty rset */ + *current=0; + *total=0; + return; + } + r=1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */ + *current=p->hits; + *total=(zint)(0.5+*current/r); +#if RSET_DEBUG + yaz_log(LOG_DEBUG,"bool_pos: (%s/%s) "ZINT_FORMAT"/"ZINT_FORMAT"= %0.4f ", + info->rset_l->control->desc, info->rset_r->control->desc, + *current, *total, r); +#endif +}