X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsprox.c;h=6972828915a45ddefec6facb48b01837b3868e35;hp=129e5210b1faec318c656464bef5ce7b84b3374c;hb=8664d6939b6be2e0de78c81ff99b8e24d304abc3;hpb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4 diff --git a/rset/rsprox.c b/rset/rsprox.c index 129e521..6972828 100644 --- a/rset/rsprox.c +++ b/rset/rsprox.c @@ -1,8 +1,5 @@ -/* $Id: rsprox.c,v 1.26 2005-03-30 09:25:24 adam Exp $ - Copyright (C) 1995-2005 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2009 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -15,9 +12,9 @@ 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 @@ -54,11 +51,7 @@ static const struct rset_control control = 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; @@ -74,18 +67,16 @@ struct rset_prox_rfd { }; -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 rset_create_prox(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,0); + 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; @@ -94,20 +85,12 @@ RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope, 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; @@ -119,25 +102,25 @@ static RSFD r_open (RSET ct, int flag) } 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); - p->terms = nmem_malloc(ct->nmem,sizeof(*p->terms) * info->rset_no); - for (i = 0; i < info->rset_no; i++) + 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->terms[i] = 0; } - p->rfd = nmem_malloc(ct->nmem,sizeof(*p->rfd) * info->rset_no); + p->rfd = nmem_malloc(ct->nmem,sizeof(*p->rfd) * ct->no_children); } yaz_log(YLOG_DEBUG,"rsprox (%s) open [%p] n=%d", - ct->control->desc, rfd, info->rset_no); + 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); + 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; @@ -146,20 +129,20 @@ static RSFD r_open (RSET ct, int flag) 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); + for (i = 0; ino_children; i++) + rset_close(p->rfd[i]); } -static int r_forward (RSFD rfd, void *buf, TERMID *term, 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; + 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; @@ -176,7 +159,7 @@ static int r_forward (RSFD rfd, void *buf, TERMID *term, const void *untilbuf) { while (p->more[0]) { - for (i = 1; i < info->rset_no; i++) + for (i = 1; i < ct->no_children; i++) { if (!p->more[i]) { @@ -209,18 +192,19 @@ static int r_forward (RSFD rfd, void *buf, TERMID *term, const void *untilbuf) break; } } - if (i == info->rset_no) + if (i == ct->no_children) { - memcpy (buf, p->buf[0], kctrl->key_size); + i = ct->no_children-1; + memcpy(buf, p->buf[i], kctrl->key_size); if (term) - *term = p->terms[0]; - p->more[0] = rset_read (p->rfd[0], p->buf[0], &p->terms[0]); + *term = p->terms[i]; + p->more[i] = rset_read(p->rfd[i], p->buf[i], &p->terms[i]); p->hits++; return 1; } } } - else if (info->rset_no == 2) + else if (ct->no_children == 2) { while (p->more[0] && p->more[1]) { @@ -238,11 +222,14 @@ static int r_forward (RSFD rfd, void *buf, TERMID *term, const void *untilbuf) seqno[n++] = (*kctrl->getseq)(p->buf[0]); while ((p->more[0] = rset_read (p->rfd[0], - p->buf[0], &p->terms[0])) >= -1 && - p->more[0] <= -1) + p->buf[0], &p->terms[0]))) + { + cmp = (*kctrl->cmp)(p->buf[0], p->buf[1]); + if (cmp <= - rfd->rset->scope || cmp >= rfd->rset->scope) + break; if (n < 500) seqno[n++] = (*kctrl->getseq)(p->buf[0]); - + } for (i = 0; igetseq)(p->buf[1]) - seqno[i]; @@ -308,7 +295,7 @@ static int r_write (RSFD rfd, const void *buf) static void r_pos (RSFD rfd, double *current, double *total) { - struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv); + RSET ct = rfd->rset; struct rset_prox_rfd *p = (struct rset_prox_rfd *)(rfd->priv); int i; double r = 0.0; @@ -317,7 +304,7 @@ static void r_pos (RSFD rfd, double *current, double *total) 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) { @@ -340,14 +327,19 @@ static void r_pos (RSFD rfd, double *current, double *total) i,*current, *total, r); } - - static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm) { - struct rset_prox_info *info = - (struct rset_prox_info *) ct->priv; int i; - for (i = 0; irset_no; i++) - rset_getterms(info->rset[i], terms, maxterms, curterm); + for (i = 0; ino_children; i++) + rset_getterms(ct->children[i], terms, maxterms, curterm); } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +