X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbool.c;h=c573e10a0bbab1e73153f082dd941f453244115c;hp=371e912202f795647ac689521298780006afd875;hb=1d5d4f08cb84516d75fcb5e6ed4199b6454cccd6;hpb=27742a4ea82e9b3494c166203b06d1d7c48da923 diff --git a/rset/rsbool.c b/rset/rsbool.c index 371e912..c573e10 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,8 +1,5 @@ -/* $Id: rsbool.c,v 1.59 2006-06-06 21:01:30 adam Exp $ - Copyright (C) 1995-2006 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 2004-2013 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,11 +12,14 @@ 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 + */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -36,19 +36,19 @@ static RSFD r_open(RSET ct, int flag); static void r_close(RSFD rfd); static void r_delete(RSET ct); static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf); -static void r_pos(RSFD rfd, double *current, double *total); +static void r_pos(RSFD rfd, double *current, double *total); static int r_read_not(RSFD rfd, void *buf, TERMID *term); static int r_write(RSFD rfd, const void *buf); static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm); -static const struct rset_control control_not = +static const struct rset_control control_not = { "not", r_delete, r_get_terms, r_open, r_close, - r_forward, + r_forward, r_pos, r_read_not, r_write, @@ -70,7 +70,7 @@ struct rfd_private { TERMID term_l; TERMID term_r; int tail; -}; +}; static RSET rsbool_create_base(const struct rset_control *ctrl, NMEM nmem, @@ -151,8 +151,8 @@ static int r_forward(RSFD rfd, void *buf, TERMID *term, p->more_l = rset_forward(p->rfd_l, p->buf_l, &p->term_l, untilbuf); if ( p->more_r && ((kctrl->cmp)(untilbuf,p->buf_r)>=rfd->rset->scope)) p->more_r = rset_forward(p->rfd_r, p->buf_r, &p->term_r, untilbuf); - p->tail = 0; - return rset_read(rfd,buf,term); + p->tail = 0; + return rset_read(rfd,buf,term); } @@ -176,14 +176,12 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term) struct rfd_private *p = (struct rfd_private *)rfd->priv; const struct rset_key_control *kctrl = rfd->rset->keycontrol; - while (p->more_l || p->more_r) + while (p->more_l) { int cmp; - if (p->more_l && p->more_r) + if (p->more_r) cmp = (*kctrl->cmp)(p->buf_l, p->buf_r); - else if (p->more_r) - cmp = rfd->rset->scope; else cmp = -rfd->rset->scope; @@ -197,15 +195,17 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term) return 1; } else if (cmp >= rfd->rset->scope) /* cmp >1 */ - p->more_r = rset_forward( p->rfd_r, p->buf_r, - &p->term_r, p->buf_l); + { + p->more_r = rset_forward( p->rfd_r, p->buf_r, + &p->term_r, p->buf_l); + } else { /* cmp== -1, 0, or 1 */ memcpy (buf, p->buf_l, kctrl->key_size); if (term) *term = p->term_l; do - { + { p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l); if (!p->more_l) break; @@ -246,18 +246,18 @@ static void r_pos(RSFD rfd, double *current, double *total) *current = rcur; /* return same as you got */ *total = rtot; /* probably -1 for not available */ } - if (rtot < 0) - rtot = rcur = 0; /* if only one useful, use it */ - if (ltot < 0) + if (rtot < 0) + rtot = rcur = 0; /* if only one useful, use it */ + if (ltot < 0) ltot = lcur = 0; - if (rtot+ltot < 1) + if (rtot+ltot < 1) { /* empty rset */ *current = *total = 0; return; } r = 1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */ *current = (double) (p->hits); - *total = *current/r ; + *total = *current/r ; #if RSET_DEBUG yaz_log(YLOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ", info->rset_l->control->desc, info->rset_r->control->desc, @@ -275,6 +275,7 @@ static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab