X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=rset%2Frsbetween.c;h=4249c7e379fdb4ff056c04c9e9569a1deb96414e;hb=863d336f803da454e03f39ee2225719fed05021e;hp=774535c7f18b8ec83f55b6f5fc1a5e307fed1093;hpb=714fc16a13c620527ebc11d254ba4e7b299a25f0;p=idzebra-moved-to-github.git diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 774535c..4249c7e 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $Id: rsbetween.c,v 1.16 2004-08-04 09:59:03 heikki Exp $ +/* $Id: rsbetween.c,v 1.18 2004-08-20 14:44:46 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -38,18 +38,19 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#define RSBETWEEN_DEBUG 0 +#define RSBETWEEN_DEBUG 0 static void *r_create_between(RSET ct, const struct rset_control *sel, void *parms); static RSFD r_open_between (RSET ct, int flag); static void r_close_between (RSFD rfd); static void r_delete_between (RSET ct); static void r_rewind_between (RSFD rfd); -static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, +static int r_forward_between(RSET ct, RSFD rfd, void *buf, int (*cmpfunc)(const void *p1, const void *p2), const void *untilbuf); -static int r_read_between (RSFD rfd, void *buf, int *term_index); +static int r_read_between (RSFD rfd, void *buf); static int r_write_between (RSFD rfd, const void *buf); +static void r_pos_between (RSFD rfd, double *current, double *total); static const struct rset_control control_between = { @@ -60,7 +61,7 @@ static const struct rset_control control_between = r_delete_between, r_rewind_between, r_forward_between, /* rset_default_forward, */ - rset_default_pos, + r_pos_between, r_read_between, r_write_between, }; @@ -74,7 +75,6 @@ struct rset_between_info { RSET rset_m; RSET rset_r; RSET rset_attr; - int term_index_s; int (*cmp)(const void *p1, const void *p2); char *(*printer)(const void *p1, char *buf); struct rset_between_rfd *rfd_list; @@ -89,9 +89,6 @@ struct rset_between_rfd { int more_m; int more_r; int more_attr; - int term_index_l; - int term_index_m; - int term_index_r; void *buf_l; void *buf_m; void *buf_r; @@ -99,6 +96,7 @@ struct rset_between_rfd { int level; struct rset_between_rfd *next; struct rset_between_info *info; + zint hits; }; #if RSBETWEEN_DEBUG @@ -135,40 +133,6 @@ static void *r_create_between (RSET ct, const struct rset_control *sel, info->cmp = between_parms->cmp; info->printer = between_parms->printer; info->rfd_list = NULL; - - info->term_index_s = info->rset_l->no_rset_terms; - if (info->rset_m) - { - ct->no_rset_terms = - info->rset_l->no_rset_terms + - info->rset_m->no_rset_terms + - info->rset_r->no_rset_terms; - ct->rset_terms = (RSET_TERM *) - xmalloc (sizeof (*ct->rset_terms) * ct->no_rset_terms); - memcpy (ct->rset_terms, info->rset_l->rset_terms, - info->rset_l->no_rset_terms * sizeof(*ct->rset_terms)); - memcpy (ct->rset_terms + info->rset_l->no_rset_terms, - info->rset_m->rset_terms, - info->rset_m->no_rset_terms * sizeof(*ct->rset_terms)); - memcpy (ct->rset_terms + info->rset_l->no_rset_terms + - info->rset_m->no_rset_terms, - info->rset_r->rset_terms, - info->rset_r->no_rset_terms * sizeof(*ct->rset_terms)); - } - else - { - ct->no_rset_terms = - info->rset_l->no_rset_terms + - info->rset_r->no_rset_terms; - ct->rset_terms = (RSET_TERM *) - xmalloc (sizeof (*ct->rset_terms) * ct->no_rset_terms); - memcpy (ct->rset_terms, info->rset_l->rset_terms, - info->rset_l->no_rset_terms * sizeof(*ct->rset_terms)); - memcpy (ct->rset_terms + info->rset_l->no_rset_terms, - info->rset_r->rset_terms, - info->rset_r->no_rset_terms * sizeof(*ct->rset_terms)); - } - return info; } @@ -196,20 +160,17 @@ static RSFD r_open_between (RSET ct, int flag) rfd->rfd_m = rset_open (info->rset_m, RSETF_READ); rfd->rfd_r = rset_open (info->rset_r, RSETF_READ); - rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l, - &rfd->term_index_l); - rfd->more_m = rset_read (info->rset_m, rfd->rfd_m, rfd->buf_m, - &rfd->term_index_m); - rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r, - &rfd->term_index_r); + rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l); + rfd->more_m = rset_read (info->rset_m, rfd->rfd_m, rfd->buf_m); + rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r); if (info->rset_attr) { - int dummy; rfd->rfd_attr = rset_open (info->rset_attr, RSETF_READ); rfd->more_attr = rset_read (info->rset_attr, rfd->rfd_attr, - rfd->buf_attr, &dummy); + rfd->buf_attr); } rfd->level=0; + rfd->hits=0; return rfd; } @@ -244,7 +205,6 @@ static void r_delete_between (RSET ct) struct rset_between_info *info = (struct rset_between_info *) ct->buf; assert (info->rfd_list == NULL); - xfree (ct->rset_terms); rset_delete (info->rset_l); rset_delete (info->rset_m); rset_delete (info->rset_r); @@ -264,22 +224,21 @@ static void r_rewind_between (RSFD rfd) rset_rewind (info->rset_l, p->rfd_l); rset_rewind (info->rset_m, p->rfd_m); 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_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, &p->term_index_m); - p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r); + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); + p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m); + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); if (info->rset_attr) { - int dummy; rset_rewind (info->rset_attr, p->rfd_attr); - p->more_attr = rset_read (info->rset_attr, p->rfd_attr, p->buf_attr, - &dummy); + p->more_attr = rset_read (info->rset_attr, p->rfd_attr, p->buf_attr); } p->level=0; + p->hits=0; } -static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, +static int r_forward_between(RSET ct, RSFD rfd, void *buf, int (*cmpfunc)(const void *p1, const void *p2), const void *untilbuf) { @@ -293,11 +252,11 @@ static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, /* naturally forward the l, m, and attr pointers */ if (p->more_m) p->more_m=rset_forward(info->rset_m,p->rfd_m, p->buf_m, - &p->term_index_m, info->cmp,untilbuf); + info->cmp,untilbuf); #if RSBETWEEN_DEBUG log2( p, "fwd: after forward M", 0,0); #endif - rc = r_read_between(rfd, buf, term_index); + rc = r_read_between(rfd, buf); #if RSBETWEEN_DEBUG log2( p, "fwd: after forward", 0,0); #endif @@ -307,7 +266,7 @@ static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, -static int r_read_between (RSFD rfd, void *buf, int *term_index) +static int r_read_between (RSFD rfd, void *buf) { struct rset_between_rfd *p = (struct rset_between_rfd *) rfd; struct rset_between_info *info = p->info; @@ -346,7 +305,6 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) else { int cmp_attr; - int dummy_term; attr_match = 0; while (p->more_attr) { @@ -359,8 +317,8 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) else if (cmp_attr > 0) break; else if (cmp_attr==-1) - p->more_attr = rset_read (info->rset_attr, p->rfd_attr, - p->buf_attr, &dummy_term); + p->more_attr = rset_read (info->rset_attr, + p->rfd_attr, p->buf_attr); /* if we had a forward that went all the way to * the seqno, we could use that. But fwd only goes * to the sysno */ @@ -368,8 +326,7 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) { p->more_attr = rset_forward( info->rset_attr, p->rfd_attr, - p->buf_attr, &dummy_term, - info->cmp, p->buf_l); + p->buf_attr, info->cmp, p->buf_l); #if RSBETWEEN_DEBUG logf(LOG_DEBUG, "btw: after frowarding attr m=%d",p->more_attr); #endif @@ -383,10 +340,8 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) { if (p->more_l) { - p->more_l=rset_forward( - info->rset_l, p->rfd_l, - p->buf_l, &p->term_index_l, - info->cmp, p->buf_m); + p->more_l=rset_forward( info->rset_l, p->rfd_l, + p->buf_l, info->cmp, p->buf_m); if (p->more_l) cmp_l= (*info->cmp)(p->buf_l, p->buf_m); else @@ -397,12 +352,10 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) } } else { - p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, - &p->term_index_l); + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); } #else - p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, - &p->term_index_l); + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); #endif if (p->more_l) { @@ -437,21 +390,17 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) #if NEWCODE if (cmp_r==-2) { - p->more_r=rset_forward( - info->rset_r, p->rfd_r, - p->buf_r, &p->term_index_r, - info->cmp, p->buf_m); + p->more_r=rset_forward( info->rset_r, p->rfd_r, + p->buf_r, info->cmp, p->buf_m); } else { - p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, - &p->term_index_r); + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); } if (p->more_r) cmp_r= (*info->cmp)(p->buf_r, p->buf_m); #else - p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, - &p->term_index_r); + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); cmp_r= (*info->cmp)(p->buf_r, p->buf_m); #endif } @@ -468,14 +417,13 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) if ( attr_match && p->level > 0) /* within a tag pair (or deeper) */ { memcpy (buf, p->buf_m, info->key_size); - *term_index = p->term_index_m; #if RSBETWEEN_DEBUG log2( p, "Returning a hit (and forwarding m)", cmp_l, cmp_r); #endif - p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, - &p->term_index_m); + p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m); if (cmp_l == 2) p->level = 0; + p->hits++; return 1; } else if ( ! p->more_l ) /* not in data, no more starts */ @@ -489,20 +437,16 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) if (cmp_l == 2) { p->level = 0; - p->more_m=rset_forward( - info->rset_m, p->rfd_m, - p->buf_m, &p->term_index_m, - info->cmp, p->buf_l); + p->more_m=rset_forward( info->rset_m, p->rfd_m, + p->buf_m, info->cmp, p->buf_l); } else { - p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, - &p->term_index_m); + p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m); } #else if (cmp_l == 2) p->level = 0; - p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, - &p->term_index_m); + p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m); #endif #if RSBETWEEN_DEBUG log2( p, "End of M loop", cmp_l, cmp_r); @@ -524,3 +468,37 @@ static int r_write_between (RSFD rfd, const void *buf) return -1; } + +static void r_pos_between (RSFD rfd, double *current, double *total) +{ + struct rset_between_rfd *p = (struct rset_between_rfd *) rfd; + struct rset_between_info *info = p->info; + double lcur,ltot; + double mcur,mtot; + double rcur,rtot; + double r; + ltot=-1; rtot=-1; + rset_pos(info->rset_l, p->rfd_l, &lcur, <ot); + rset_pos(info->rset_m, p->rfd_m, &mcur, &mtot); + rset_pos(info->rset_r, p->rfd_r, &rcur, &rtot); + if ( (ltot<0) && (mtot<0) && (rtot<0) ) { /*no position */ + *current=mcur; /* return same as you got */ + *total=mtot; /* probably -1 for not available */ + } + if ( ltot<0) { ltot=0; lcur=0;} /* if only one useful, use it */ + if ( mtot<0) { mtot=0; mcur=0;} + if ( rtot<0) { rtot=0; rcur=0;} + if ( ltot+mtot+rtot < 1 ) { /* empty rset */ + *current=0; + *total=0; + return; + } + r=1.0*(lcur+mcur+rcur)/(ltot+mtot+rtot); /* weighed average of l and r */ + *current=p->hits; + *total=*current/r ; +#if RSBETWEEN_DEBUG + yaz_log(LOG_DEBUG,"betw_pos: (%s/%s) %0.1f/%0.1f= %0.4f ", + info->rset_l->control->desc, info->rset_r->control->desc, + *current, *total, r); +#endif +}