-/* $Id: rsbool.c,v 1.49 2004-10-15 10:07:34 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: rsbool.c,v 1.58 2006-05-10 08:13:33 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <string.h>
#include <assert.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <rset.h>
#ifndef RSET_DEBUG
#define RSET_DEBUG 0
#endif
-static RSFD r_open (RSET ct, int flag);
-static void r_close (RSFD rfd);
-static void r_delete (RSET ct);
+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 int r_read_and (RSFD rfd, void *buf, TERMID *term);
-static int r_read_or (RSFD rfd, void *buf, TERMID *term);
-static int r_read_not (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 int r_read_and(RSFD rfd, void *buf, TERMID *term);
+static int r_read_or(RSFD rfd, void *buf, TERMID *term);
+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_and =
{
"and",
r_delete,
+ r_get_terms,
r_open,
r_close,
r_forward,
{
"or",
r_delete,
+ r_get_terms,
r_open,
r_close,
r_forward,
{
"not",
r_delete,
+ r_get_terms,
r_open,
r_close,
r_forward,
r_write,
};
-
-const struct rset_control *rset_kind_and = &control_and;
-const struct rset_control *rset_kind_or = &control_or;
-const struct rset_control *rset_kind_not = &control_not;
-
-struct rset_bool_info {
+struct rset_private {
RSET rset_l;
RSET rset_r;
};
-struct rset_bool_rfd {
+struct rfd_private {
zint hits;
RSFD rfd_l;
RSFD rfd_r;
int tail;
};
-static RSET rsbool_create_base( const struct rset_control *ctrl,
- NMEM nmem, const struct key_control *kcontrol,
- int scope,
- RSET rset_l, RSET rset_r)
+static RSET rsbool_create_base(const struct rset_control *ctrl,
+ NMEM nmem,
+ struct rset_key_control *kcontrol,
+ int scope, RSET rset_l, RSET rset_r)
{
- RSET rnew=rset_create_base(ctrl, nmem, kcontrol, scope,0);
- struct rset_bool_info *info;
- info = (struct rset_bool_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ RSET children[2], rnew;
+ struct rset_private *info;
+
+ children[0] = rset_l;
+ children[1] = rset_r;
+ rnew = rset_create_base(ctrl, nmem, kcontrol, scope, 0, 2, children);
+ info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info));
info->rset_l = rset_l;
info->rset_r = rset_r;
- rnew->priv=info;
+ rnew->priv = info;
return rnew;
}
-
-RSET rsbool_create_and( NMEM nmem, const struct key_control *kcontrol,
- int scope,
- RSET rset_l, RSET rset_r)
+RSET rsbool_create_and( NMEM nmem, struct rset_key_control *kcontrol,
+ int scope, RSET rset_l, RSET rset_r)
{
- return rsbool_create_base(rset_kind_and, nmem, kcontrol,
+ return rsbool_create_base(&control_and, nmem, kcontrol,
scope,
rset_l, rset_r);
}
-RSET rsbool_create_or( NMEM nmem, const struct key_control *kcontrol,
- int scope,
- RSET rset_l, RSET rset_r)
+RSET rsbool_create_or(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope, RSET rset_l, RSET rset_r)
{
- return rsbool_create_base(rset_kind_or, nmem, kcontrol,
- scope,
- rset_l, rset_r);
+ return rsbool_create_base(&control_or, nmem, kcontrol,
+ scope, rset_l, rset_r);
}
-RSET rsbool_create_not( NMEM nmem, const struct key_control *kcontrol,
- int scope,
- RSET rset_l, RSET rset_r)
+RSET rsbool_create_not(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope, RSET rset_l, RSET rset_r)
{
- return rsbool_create_base(rset_kind_not, nmem, kcontrol,
- scope,
- rset_l, rset_r);
+ return rsbool_create_base(&control_not, nmem, kcontrol,
+ scope, rset_l, rset_r);
}
-static void r_delete (RSET ct)
+static void r_delete(RSET ct)
{
- struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
- rset_delete (info->rset_l);
- rset_delete (info->rset_r);
}
-
-static RSFD r_open (RSET ct, int flag)
+static RSFD r_open(RSET ct, int flag)
{
- struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
+ struct rset_private *info = (struct rset_private *) ct->priv;
RSFD rfd;
- struct rset_bool_rfd *p;
-
+ struct rfd_private *p;
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "bool set type is read-only");
+ yaz_log(YLOG_FATAL, "bool set type is read-only");
return NULL;
}
rfd = rfd_create_base(ct);
if (rfd->priv)
- p=(struct rset_bool_rfd *)rfd->priv;
+ p = (struct rfd_private *)rfd->priv;
else {
- p=nmem_malloc(ct->nmem,sizeof(*p));
- rfd->priv=p;
+ p = nmem_malloc(ct->nmem,sizeof(*p));
+ rfd->priv = p;
p->buf_l = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
p->buf_r = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
}
- logf(LOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd);
+ yaz_log(YLOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd);
p->hits=0;
p->rfd_l = rset_open (info->rset_l, RSETF_READ);
p->rfd_r = rset_open (info->rset_r, RSETF_READ);
- p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
- p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+ p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
+ p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
p->tail = 0;
return rfd;
}
static void r_close (RSFD rfd)
{
- /* struct rset_bool_info *info = (struct rset_bool_info*)(rfd->rset->priv); */
- struct rset_bool_rfd *prfd=(struct rset_bool_rfd *)rfd->priv;
+ struct rfd_private *prfd=(struct rfd_private *)rfd->priv;
rset_close (prfd->rfd_l);
rset_close (prfd->rfd_r);
- rfd_delete_base(rfd);
}
-
-
-static int r_forward (RSFD rfd, void *buf, TERMID *term,
+static int r_forward(RSFD rfd, void *buf, TERMID *term,
const void *untilbuf)
{
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
- const struct key_control *kctrl=rfd->rset->keycontrol;
+ struct rfd_private *p = (struct rfd_private *)rfd->priv;
+ const struct rset_key_control *kctrl=rfd->rset->keycontrol;
if ( p->more_l && ((kctrl->cmp)(untilbuf,p->buf_l)>=rfd->rset->scope) )
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;
+ p->tail = 0;
return rset_read(rfd,buf,term);
}
3,1
*/
-static int r_read_and (RSFD rfd, void *buf, TERMID *term)
+static int r_read_and(RSFD rfd, void *buf, TERMID *term)
{
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
- const struct key_control *kctrl=rfd->rset->keycontrol;
+ 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)
{
else
cmp = rfd->rset->scope;
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
rfd, p->more_l, p->more_r, cmp, p->tail);
- (*kctrl->log_item)(LOG_DEBUG, p->buf_l, "left ");
- (*kctrl->log_item)(LOG_DEBUG, p->buf_r, "right ");
+ (*kctrl->log_item)(YLOG_DEBUG, p->buf_l, "left ");
+ (*kctrl->log_item)(YLOG_DEBUG, p->buf_r, "right ");
#endif
if (!cmp)
{ /* cmp==0 */
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
*term=p->term_l;
- p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+ p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
p->tail = 1;
}
else if ( (cmp>0) && (cmp<rfd->rset->scope))
memcpy (buf, p->buf_r, kctrl->key_size);
if (term)
*term=p->term_r;
- p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+ p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
p->tail = 1;
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
+ yaz_log(YLOG_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);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ key_logdump(YLOG_DEBUG,buf);
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
*term=p->term_l;
- p->more_l = rset_read (p->rfd_l, p->buf_l,&p->term_l);
+ p->more_l = rset_read(p->rfd_l, p->buf_l,&p->term_l);
p->tail = 1;
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
memcpy (buf, p->buf_r, kctrl->key_size);
if (term)
*term=p->term_r;
- p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+ p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
if (!p->more_r || (*kctrl->cmp)(p->buf_r, buf) > 1)
p->tail = 0;
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
else
{
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] about to forward R "
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] about to forward R "
"m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
#endif
{
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
- *term=p->term_l;
- p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+ *term = p->term_l;
+ p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
if (!p->more_l || (*kctrl->cmp)(p->buf_l, buf) > 1)
p->tail = 0;
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
else
{
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] about to forward L "
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] about to forward L "
"m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
#endif
}
}
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_and [%p] reached its end",rfd);
+ yaz_log(YLOG_DEBUG, "r_read_and [%p] reached its end",rfd);
#endif
return 0;
}
static int r_read_or (RSFD rfd, void *buf, TERMID *term)
{
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
- const struct key_control *kctrl=rfd->rset->keycontrol;
+ 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)
{
{ /* cmp==0 */
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
- *term=p->term_l;
- p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+ *term = p->term_l;
+ p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
/* FIXME - is this right, should we not leave _r as it is */
/* and return that in the next read, so that ranking etc */
/* get to see both? */
- p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+ p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
+ yaz_log(YLOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
{
memcpy (buf, p->buf_r, kctrl->key_size);
if (term)
- *term=p->term_r;
- p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+ *term = p->term_r;
+ p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
+ yaz_log(YLOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
{
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
- *term=p->term_l;
- p->more_l = rset_read ( p->rfd_l, p->buf_l, &p->term_l);
+ *term = p->term_l;
+ p->more_l = rset_read( p->rfd_l, p->buf_l, &p->term_l);
#if RSET_DEBUG
- logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
+ yaz_log(YLOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- (*kctrl->log_item)(LOG_DEBUG, buf, "");
+ (*kctrl->log_item)(YLOG_DEBUG, buf, "");
#endif
p->hits++;
return 1;
return 0;
}
-static int r_read_not (RSFD rfd, void *buf, TERMID *term)
+static int r_read_not(RSFD rfd, void *buf, TERMID *term)
{
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
- const struct key_control *kctrl=rfd->rset->keycontrol;
+ 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)
{
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
*term=p->term_l;
- p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+ p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
p->hits++;
return 1;
}
{ /* cmp== -1, 0, or 1 */
memcpy (buf, p->buf_l, kctrl->key_size);
if (term)
- *term=p->term_l;
+ *term = p->term_l;
do
{
- p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+ p->more_l = rset_read(p->rfd_l, p->buf_l, &p->term_l);
if (!p->more_l)
break;
cmp = (*kctrl->cmp)(p->buf_l, buf);
/* (cmp >= -1 && cmp <= 1) */
do
{
- p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+ p->more_r = rset_read(p->rfd_r, p->buf_r, &p->term_r);
if (!p->more_r)
break;
cmp = (*kctrl->cmp)(p->buf_r, buf);
}
-static int r_write (RSFD rfd, const void *buf)
+static int r_write(RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "bool set type is read-only");
+ yaz_log(YLOG_FATAL, "bool set type is read-only");
return -1;
}
-static void r_pos (RSFD rfd, double *current, double *total)
+static void r_pos(RSFD rfd, double *current, double *total)
{
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
- double lcur,ltot;
- double rcur,rtot;
+ struct rfd_private *p = (struct rfd_private *)rfd->priv;
+ double lcur, ltot;
+ double rcur, rtot;
double r;
- ltot=-1; rtot=-1;
- rset_pos(p->rfd_l, &lcur, <ot);
- rset_pos(p->rfd_r, &rcur, &rtot);
+ ltot = -1;
+ rtot = -1;
+ rset_pos(p->rfd_l, &lcur, <ot);
+ rset_pos(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 */
+ *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 < 1 ) { /* empty rset */
- *current=0;
- *total=0;
+ if (rtot < 0)
+ rtot = rcur = 0; /* if only one useful, use it */
+ if (ltot < 0)
+ ltot = lcur = 0;
+ 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 ;
+ r = 1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */
+ *current = (double) (p->hits);
+ *total = *current/r ;
#if RSET_DEBUG
- yaz_log(LOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ",
+ yaz_log(YLOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ",
info->rset_l->control->desc, info->rset_r->control->desc,
*current, *total, r);
#endif
}
+
+static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
+{
+ struct rset_private *info = (struct rset_private *) ct->priv;
+ rset_getterms(info->rset_l, terms, maxterms, curterm);
+ rset_getterms(info->rset_r, terms, maxterms, curterm);
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff