-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsbool.c,v $
- * Revision 1.16 1999-05-26 07:49:14 adam
- * C++ compilation.
- *
- * Revision 1.15 1999/02/02 14:51:32 adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.14 1998/03/05 08:36:27 adam
- * New result set model.
- *
- * Revision 1.13 1997/12/18 10:54:24 adam
- * New method result set method rs_hits that returns the number of
- * hits in result-set (if known). The ranked result set returns real
- * number of hits but only when not combined with other operands.
- *
- * Revision 1.12 1997/10/31 12:37:01 adam
- * Code calls xfree() instead of free().
- *
- * Revision 1.11 1997/09/09 13:38:15 adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.10 1996/10/29 13:55:20 adam
- * Include of zebrautl.h instead of alexutil.h.
- *
- * Revision 1.9 1995/12/11 09:15:22 adam
- * New set types: sand/sor/snot - ranked versions of and/or/not in
- * ranked/semi-ranked result sets.
- * Note: the snot not finished yet.
- * New rset member: flag.
- * Bug fix: r_delete in rsrel.c did free bad memory block.
- *
- * Revision 1.8 1995/10/12 12:41:55 adam
- * Private info (buf) moved from struct rset_control to struct rset.
- * Bug fixes in relevance.
- *
- * Revision 1.7 1995/10/10 14:00:03 adam
- * Function rset_open changed its wflag parameter to general flags.
- *
- * Revision 1.6 1995/10/06 14:38:05 adam
- * New result set method: r_score.
- * Local no (sysno) and score is transferred to retrieveCtrl.
- *
- * Revision 1.5 1995/09/08 14:52:41 adam
- * Work on relevance feedback.
- *
- * Revision 1.4 1995/09/08 08:54:04 adam
- * More efficient and operation.
- *
- * Revision 1.3 1995/09/07 13:58:43 adam
- * New parameter: result-set file descriptor (RSFD) to support multiple
- * positions within the same result-set.
- * Boolean operators: and, or, not implemented.
- *
- * Revision 1.2 1995/09/06 16:11:55 adam
- * More work on boolean sets.
- *
- * Revision 1.1 1995/09/06 13:27:15 adam
- * New set type: bool. Not finished yet.
- *
- */
+/* $Id: rsbool.c,v 1.20 2003-01-13 22:16:24 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
#include <stdio.h>
#include <stdlib.h>
int term_index_r;
void *buf_l;
void *buf_r;
+ int tail;
struct rset_bool_rfd *next;
struct rset_bool_info *info;
};
&rfd->term_index_l);
rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r,
&rfd->term_index_r);
+ rfd->tail = 0;
return rfd;
}
return 0;
}
+
+/*
+ 1,1 1,3
+ 1,9 2,1
+ 1,11 3,1
+ 2,9
+
+ 1,1 1,1
+ 1,3 1,3
+ 1,9
+ 1,11
+ 2,1 2,1
+ 2,9
+ 3,1
+*/
+
static int r_read_and (RSFD rfd, void *buf, int *term_index)
{
struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
struct rset_bool_info *info = p->info;
- while (p->more_l && p->more_r)
+ while (p->more_l || p->more_r)
{
int cmp;
- cmp = (*info->cmp)(p->buf_l, p->buf_r);
+ if (p->more_l && p->more_r)
+ cmp = (*info->cmp)(p->buf_l, p->buf_r);
+ else if (p->more_l)
+ cmp = -2;
+ else
+ cmp = 2;
if (!cmp)
{
memcpy (buf, p->buf_l, info->key_size);
&p->term_index_l);
p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
&p->term_index_r);
+ p->tail = 1;
return 1;
}
else if (cmp == 1)
{
memcpy (buf, p->buf_r, info->key_size);
-
*term_index = p->term_index_r + info->term_index_s;
p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
&p->term_index_r);
+ p->tail = 1;
return 1;
}
else if (cmp == -1)
*term_index = p->term_index_l;
p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
&p->term_index_l);
+ p->tail = 1;
return 1;
}
else if (cmp > 1)
+ {
+ memcpy (buf, p->buf_r, info->key_size);
+ *term_index = p->term_index_r + info->term_index_s;
+
p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
- &p->term_index_r);
+ &p->term_index_r);
+ if (p->tail)
+ {
+ if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1)
+ p->tail = 0;
+ return 1;
+ }
+ }
else
+ {
+ memcpy (buf, p->buf_l, info->key_size);
+ *term_index = p->term_index_l;
p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
&p->term_index_l);
+ if (p->tail)
+ {
+ if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1)
+ p->tail = 0;
+ return 1;
+ }
+ }
}
return 0;
}
projects / idzebra-moved-to-github.git / blobdiff