-/* $Id: rsbool.c,v 1.46 2004-09-01 15:01:32 heikki Exp $
+/* $Id: rsbool.c,v 1.50 2004-10-22 10:12:51 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
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_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);
-static int r_read_or (RSFD rfd, void *buf);
-static int r_read_not (RSFD rfd, void *buf);
+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_rewind,
r_forward,
r_pos,
r_read_and,
{
"or",
r_delete,
+ r_get_terms,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read_or,
{
"not",
r_delete,
+ r_get_terms,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read_not,
int more_r;
void *buf_l;
void *buf_r;
+ TERMID term_l;
+ TERMID term_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)
{
- RSET rnew=rset_create_base(ctrl, nmem, kcontrol);
+ 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));
info->rset_l = rset_l;
RSET rsbool_create_and( NMEM nmem, const struct key_control *kcontrol,
+ int scope,
RSET rset_l, RSET rset_r)
{
return rsbool_create_base(rset_kind_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)
{
return rsbool_create_base(rset_kind_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)
{
return rsbool_create_base(rset_kind_not, nmem, kcontrol,
+ scope,
rset_l, rset_r);
}
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->more_r = rset_read (p->rfd_r, p->buf_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_rewind (RSFD rfd)
-{
- /* struct rset_bool_info *info = (struct rset_bool_info*)(rfd->rset->priv); */
- struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
- logf (LOG_DEBUG, "rsbool_rewind");
- rset_rewind (p->rfd_l);
- rset_rewind (p->rfd_r);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
- p->hits=0;
-}
-
-static int r_forward (RSFD rfd, void *buf,
+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;
- if ( p->more_l && ((kctrl->cmp)(untilbuf,p->buf_l)==2) )
- p->more_l = rset_forward(p->rfd_l, p->buf_l, untilbuf);
- if ( p->more_r && ((kctrl->cmp)(untilbuf,p->buf_r)==2))
- p->more_r = rset_forward(p->rfd_r, p->buf_r, untilbuf);
+ 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;
- return rset_read(rfd,buf);
+ return rset_read(rfd,buf,term);
}
3,1
*/
-static int r_read_and (RSFD rfd, void *buf)
+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;
if (p->more_l && p->more_r)
cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
else if (p->more_l)
- cmp = -2;
+ cmp = -rfd->rset->scope;
else
- cmp = 2;
+ cmp = rfd->rset->scope;
#if RSET_DEBUG
logf (LOG_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_r, "right ");
#endif
if (!cmp)
- {
+ { /* cmp==0 */
memcpy (buf, p->buf_l, kctrl->key_size);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
+ if (term)
+ *term=p->term_l;
+ p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
p->tail = 1;
}
- else if (cmp == 1)
- {
+ else if ( (cmp>0) && (cmp<rfd->rset->scope))
+ { /* typically cmp == 1 */
memcpy (buf, p->buf_r, kctrl->key_size);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
+ if (term)
+ *term=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",
p->hits++;
return 1;
}
- else if (cmp == -1)
- {
+ else if ( (cmp<0) && (-cmp<rfd->rset->scope))
+ { /* cmp == -1 */
memcpy (buf, p->buf_l, kctrl->key_size);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
+ if (term)
+ *term=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",
p->hits++;
return 1;
}
- else if (cmp > 1) /* cmp == 2 */
- {
+ else if (cmp >= rfd->rset->scope )
+ { /* cmp == 2 */
if (p->tail)
{
memcpy (buf, p->buf_r, kctrl->key_size);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
+ if (term)
+ *term=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
rfd, p->more_l, p->more_r, cmp);
#endif
if (p->more_r && p->more_l)
- p->more_r = rset_forward( p->rfd_r, p->buf_r, p->buf_l);
+ p->more_r = rset_forward( p->rfd_r, p->buf_r,
+ &p->term_r, p->buf_l);
else
return 0; /* no point in reading further */
}
}
- else /* cmp == -2 */
- {
+ else
+ { /* cmp == -2 */
if (p->tail)
{
memcpy (buf, p->buf_l, kctrl->key_size);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
+ if (term)
+ *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
rfd, p->more_l, p->more_r, cmp);
#endif
if (p->more_r && p->more_l)
- p->more_l = rset_forward(p->rfd_l, p->buf_l, p->buf_r);
+ p->more_l = rset_forward(p->rfd_l, p->buf_l,
+ &p->term_l, p->buf_r);
else
return 0; /* no point in reading further */
}
return 0;
}
-static int r_read_or (RSFD rfd, void *buf)
+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;
if (p->more_l && p->more_r)
cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
else if (p->more_r)
- cmp = 2;
+ cmp = rfd->rset->scope;
else
- cmp = -2;
+ cmp = -rfd->rset->scope;
if (!cmp)
- {
+ { /* cmp==0 */
memcpy (buf, p->buf_l, kctrl->key_size);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
+ if (term)
+ *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);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
else if (cmp > 0)
{
memcpy (buf, p->buf_r, kctrl->key_size);
- p->more_r = rset_read (p->rfd_r, p->buf_r);
+ if (term)
+ *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",
p->more_l, p->more_r, cmp);
else
{
memcpy (buf, p->buf_l, kctrl->key_size);
- p->more_l = rset_read ( p->rfd_l, p->buf_l);
+ if (term)
+ *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",
p->more_l, p->more_r, cmp);
return 0;
}
-static int r_read_not (RSFD rfd, void *buf)
+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;
if (p->more_l && p->more_r)
cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
else if (p->more_r)
- cmp = 2;
+ cmp = rfd->rset->scope;
else
- cmp = -2;
- if (cmp < -1)
- {
+ cmp = -rfd->rset->scope;
+
+ if (cmp <= -rfd->rset->scope)
+ { /* cmp == -2 */
memcpy (buf, p->buf_l, kctrl->key_size);
- p->more_l = rset_read (p->rfd_l, p->buf_l);
+ if (term)
+ *term=p->term_l;
+ p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
p->hits++;
return 1;
}
- else if (cmp > 1)
- p->more_r = rset_forward( p->rfd_r, p->buf_r, p->buf_l);
+ 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);
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->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);
- } while (cmp >= -1 && cmp <= 1);
+ } while (abs(cmp)<rfd->rset->scope);
+ /* (cmp >= -1 && cmp <= 1) */
do
{
- p->more_r = rset_read (p->rfd_r, p->buf_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);
- } while (cmp >= -1 && cmp <= 1);
+ } while (abs(cmp)<rfd->rset->scope);
+ /* (cmp >= -1 && cmp <= 1) */
}
}
return 0;
*current, *total, r);
#endif
}
+
+static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
+{
+ struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
+ rset_getterms(info->rset_l, terms, maxterms, curterm);
+ rset_getterms(info->rset_r, terms, maxterms, curterm);
+}
+