X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsprox.c;h=334a2f7dbc4574bb04470eb83d6a3f156f333bea;hb=7a2d0f25682890bde5d8f2883d6020df2ed0b365;hp=b55b53dcdfdf21b8556c64a39584c405dbebfa1e;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git diff --git a/rset/rsprox.c b/rset/rsprox.c index b55b53d..334a2f7 100644 --- a/rset/rsprox.c +++ b/rset/rsprox.c @@ -1,6 +1,6 @@ -/* $Id: rsprox.c,v 1.16 2004-09-09 10:08:06 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: rsprox.c,v 1.29 2005-05-24 11:35:43 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -25,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include +#include #include #ifndef RSET_DEBUG @@ -35,30 +35,26 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); static void r_delete (RSET ct); -static void r_rewind (RSFD rfd); -static int r_forward(RSFD rfd, void *buf, const void *untilbuf); -static int r_read (RSFD rfd, void *buf); +static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf); +static int r_read (RSFD rfd, void *buf, TERMID *term); static int r_write (RSFD rfd, const void *buf); static void r_pos (RSFD rfd, double *current, double *total); +static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm); static const struct rset_control control = { "prox", r_delete, + r_get_terms, r_open, r_close, - r_rewind, r_forward, r_pos, r_read, r_write, }; -const struct rset_control *rset_kind_prox = &control; - struct rset_prox_info { - RSET *rset; /* array of 'child' rsets */ - int rset_no; /* how many of them */ int ordered; int exclusion; int relation; @@ -69,109 +65,88 @@ struct rset_prox_rfd { RSFD *rfd; char **buf; /* lookahead key buffers */ char *more; /* more in each lookahead? */ + TERMID *terms; /* lookahead terms */ zint hits; }; -RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope, - int rset_no, RSET *rset, - int ordered, int exclusion, - int relation, int distance) +RSET rsprox_create(NMEM nmem, struct rset_key_control *kcontrol, + int scope, + int rset_no, RSET *rset, + int ordered, int exclusion, + int relation, int distance) { - RSET rnew=rset_create_base(&control, nmem, kcontrol, scope); + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, 0, + rset_no, rset); struct rset_prox_info *info; info = (struct rset_prox_info *) nmem_malloc(rnew->nmem,sizeof(*info)); - info->rset = nmem_malloc(rnew->nmem,rset_no * sizeof(*info->rset)); - memcpy(info->rset, rset, - rset_no * sizeof(*info->rset)); - info->rset_no=rset_no; - info->ordered=ordered; - info->exclusion=exclusion; - info->relation=relation; - info->distance=distance; - rnew->priv=info; + info->ordered = ordered; + info->exclusion = exclusion; + info->relation = relation; + info->distance = distance; + rnew->priv = info; return rnew; } - static void r_delete (RSET ct) { - struct rset_prox_info *info = (struct rset_prox_info *) ct->priv; - int i; - - for (i = 0; irset_no; i++) - rset_delete (info->rset[i]); } - static RSFD r_open (RSET ct, int flag) { - struct rset_prox_info *info = (struct rset_prox_info *) ct->priv; RSFD rfd; struct rset_prox_rfd *p; int i; if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "prox set type is read-only"); + yaz_log(YLOG_FATAL, "prox set type is read-only"); return NULL; } rfd = rfd_create_base(ct); if (rfd->priv) - p=(struct rset_prox_rfd *)(rfd->priv); + p = (struct rset_prox_rfd *)(rfd->priv); else { - p = (struct rset_prox_rfd *) nmem_malloc (ct->nmem,sizeof(*p)); - rfd->priv=p; - p->more = nmem_malloc (ct->nmem,sizeof(*p->more) * info->rset_no); - p->buf = nmem_malloc(ct->nmem,sizeof(*p->buf) * info->rset_no); - for (i = 0; i < info->rset_no; i++) + p = (struct rset_prox_rfd *) nmem_malloc(ct->nmem,sizeof(*p)); + rfd->priv = p; + p->more = nmem_malloc (ct->nmem,sizeof(*p->more) * ct->no_children); + p->buf = nmem_malloc(ct->nmem,sizeof(*p->buf) * ct->no_children); + p->terms = nmem_malloc(ct->nmem,sizeof(*p->terms) * ct->no_children); + for (i = 0; i < ct->no_children; i++) + { p->buf[i] = nmem_malloc(ct->nmem,ct->keycontrol->key_size); - p->rfd = nmem_malloc(ct->nmem,sizeof(*p->rfd) * info->rset_no); + p->terms[i] = 0; + } + p->rfd = nmem_malloc(ct->nmem,sizeof(*p->rfd) * ct->no_children); } - logf(LOG_DEBUG,"rsprox (%s) open [%p] n=%d", - ct->control->desc, rfd, info->rset_no); + yaz_log(YLOG_DEBUG,"rsprox (%s) open [%p] n=%d", + ct->control->desc, rfd, ct->no_children); - for (i = 0; i < info->rset_no; i++) { - p->rfd[i] = rset_open (info->rset[i], RSETF_READ); - p->more[i] = rset_read (p->rfd[i], p->buf[i]); + for (i = 0; i < ct->no_children; i++) { + p->rfd[i] = rset_open (ct->children[i], RSETF_READ); + p->more[i] = rset_read (p->rfd[i], p->buf[i], &p->terms[i]); } - p->hits=0; + p->hits = 0; return rfd; } static void r_close (RSFD rfd) { - struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv); - struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv); + RSET ct = rfd->rset; + struct rset_prox_rfd *p = (struct rset_prox_rfd *)(rfd->priv); int i; - for (i = 0; irset_no; i++) - rset_close (p->rfd[i]); - rfd_delete_base(rfd); -} - -static void r_rewind (RSFD rfd) -{ - struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv); - struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv); - int i; - - logf (LOG_DEBUG, "rsprox_rewind"); - - for (i = 0; i < info->rset_no; i++) - { - rset_rewind (p->rfd[i]); - p->more[i] = rset_read (p->rfd[i], p->buf[i]); - } - p->hits=0; + for (i = 0; ino_children; i++) + rset_close(p->rfd[i]); } -static int r_forward (RSFD rfd, void *buf, const void *untilbuf) +static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf) { - struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv); - struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv); - const struct key_control *kctrl=rfd->rset->keycontrol; - int cmp=0; + RSET ct = rfd->rset; + struct rset_prox_info *info = (struct rset_prox_info *)(ct->priv); + struct rset_prox_rfd *p = (struct rset_prox_rfd *)(rfd->priv); + const struct rset_key_control *kctrl = ct->keycontrol; + int cmp = 0; int i; if (untilbuf) @@ -179,14 +154,15 @@ static int r_forward (RSFD rfd, void *buf, const void *untilbuf) /* it is enough to forward first one. Other will follow. */ if ( p->more[0] && /* was: cmp >=2 */ ((kctrl->cmp)(untilbuf, p->buf[0]) >= rfd->rset->scope) ) - p->more[0] = rset_forward(p->rfd[0], p->buf[0], untilbuf); + p->more[0] = rset_forward(p->rfd[0], p->buf[0], + &p->terms[0], untilbuf); } if (info->ordered && info->relation == 3 && info->exclusion == 0 && info->distance == 1) { while (p->more[0]) { - for (i = 1; i < info->rset_no; i++) + for (i = 1; i < ct->no_children; i++) { if (!p->more[i]) { @@ -198,6 +174,7 @@ static int r_forward (RSFD rfd, void *buf, const void *untilbuf) { p->more[i-1] = rset_forward (p->rfd[i-1], p->buf[i-1], + &p->terms[i-1], p->buf[i]); break; } @@ -206,37 +183,40 @@ static int r_forward (RSFD rfd, void *buf, const void *untilbuf) if ((*kctrl->getseq)(p->buf[i-1]) +1 != (*kctrl->getseq)(p->buf[i])) { /* FIXME - We need more flexible multilevel stuff */ - p->more[i-1] = rset_read ( p->rfd[i-1], p->buf[i-1]); + p->more[i-1] = rset_read ( p->rfd[i-1], p->buf[i-1], + &p->terms[i-1]); break; } } else { p->more[i] = rset_forward (p->rfd[i], - p->buf[i], p->buf[i-1]); + p->buf[i], &p->terms[i], p->buf[i-1]); break; } } - if (i == info->rset_no) + if (i == ct->no_children) { memcpy (buf, p->buf[0], kctrl->key_size); - p->more[0] = rset_read (p->rfd[0], p->buf[0]); + if (term) + *term = p->terms[0]; + p->more[0] = rset_read (p->rfd[0], p->buf[0], &p->terms[0]); p->hits++; return 1; } } } - else if (info->rset_no == 2) + else if (ct->no_children == 2) { while (p->more[0] && p->more[1]) { int cmp = (*kctrl->cmp)(p->buf[0], p->buf[1]); if ( cmp <= - rfd->rset->scope) /* cmp<-1*/ - p->more[0] = rset_forward (p->rfd[0], - p->buf[0], p->buf[1]); + p->more[0] = rset_forward (p->rfd[0], p->buf[0], + &p->terms[0],p->buf[1]); else if ( cmp >= rfd->rset->scope ) /* cmp>1 */ - p->more[1] = rset_forward (p->rfd[1], - p->buf[1], p->buf[0]); + p->more[1] = rset_forward (p->rfd[1], p->buf[1], + &p->terms[1],p->buf[0]); else { zint seqno[500]; /* FIXME - why 500 ?? */ @@ -244,14 +224,14 @@ static int r_forward (RSFD rfd, void *buf, const void *untilbuf) seqno[n++] = (*kctrl->getseq)(p->buf[0]); while ((p->more[0] = rset_read (p->rfd[0], - p->buf[0])) >= -1 && + p->buf[0], &p->terms[0])) >= -1 && p->more[0] <= -1) if (n < 500) seqno[n++] = (*kctrl->getseq)(p->buf[0]); for (i = 0; igetseq)(p->buf[1]) - seqno[i]; + zint diff = (*kctrl->getseq)(p->buf[1]) - seqno[i]; int excl = info->exclusion; if (!info->ordered && diff < 0) diff = -diff; @@ -285,13 +265,15 @@ static int r_forward (RSFD rfd, void *buf, const void *untilbuf) if (excl) { memcpy (buf, p->buf[1], kctrl->key_size); - - p->more[1] = rset_read ( p->rfd[1], p->buf[1]); + if (term) + *term = p->terms[1]; + p->more[1] = rset_read ( p->rfd[1], p->buf[1], + &p->terms[1]); p->hits++; return 1; } } - p->more[1] = rset_read (p->rfd[1], p->buf[1]); + p->more[1] = rset_read (p->rfd[1], p->buf[1], &p->terms[1]); } } } @@ -299,29 +281,29 @@ static int r_forward (RSFD rfd, void *buf, const void *untilbuf) } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, TERMID *term) { - return r_forward(rfd, buf, 0); + return r_forward(rfd, buf, term, 0); } static int r_write (RSFD rfd, const void *buf) { - logf (LOG_FATAL, "prox set type is read-only"); + yaz_log(YLOG_FATAL, "prox set type is read-only"); return -1; } static void r_pos (RSFD rfd, double *current, double *total) { - struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv); - struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv); + RSET ct = rfd->rset; + struct rset_prox_rfd *p = (struct rset_prox_rfd *)(rfd->priv); int i; - double cur,tot=-1; - double scur=0,stot=0; - double r; + double r = 0.0; + double cur, tot = -1.0; + double scur = 0.0, stot = 0.0; - logf (LOG_DEBUG, "rsprox_pos"); + yaz_log(YLOG_DEBUG, "rsprox_pos"); - for (i = 0; i < info->rset_no; i++) + for (i = 0; i < ct->no_children; i++) { rset_pos(p->rfd[i], &cur, &tot); if (tot>0) { @@ -330,16 +312,24 @@ static void r_pos (RSFD rfd, double *current, double *total) } } if (tot <0) { /* nothing found */ - *current=-1; - *total=-1; - } else if (tot <1) { /* most likely tot==0 */ - *current=0; - *total=0; + *current = -1; + *total = -1; + } else if (tot < 1) { /* most likely tot==0 */ + *current = 0; + *total = 0; } else { - r=scur/stot; - *current=p->hits; + r = scur/stot; + *current = (double) p->hits; *total=*current/r ; } - logf(LOG_DEBUG,"prox_pos: [%d] %0.1f/%0.1f= %0.4f ", + yaz_log(YLOG_DEBUG,"prox_pos: [%d] %0.1f/%0.1f= %0.4f ", i,*current, *total, r); } + +static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm) +{ + int i; + for (i = 0; ino_children; i++) + rset_getterms(ct->children[i], terms, maxterms, curterm); +} +