X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=53997d0dd4fdf44bea1c89f4fc46ddbe652340df;hb=bad06dda453543b8dd716ee54e9b7cb2b015b6e5;hp=5ebab94045698281835ff3e0c73d41d1d4dd434f;hpb=33b386a95c0aac273527d596ce1aafa0dc567b7b;p=idzebra-moved-to-github.git diff --git a/rset/rsbool.c b/rset/rsbool.c index 5ebab94..53997d0 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,62 +1,26 @@ -/* - * Copyright (C) 1994-1998, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsbool.c,v $ - * 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.19 2002-08-02 19:26:57 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 #include @@ -145,10 +109,10 @@ struct rset_bool_rfd { static void *r_create (RSET ct, const struct rset_control *sel, void *parms) { - rset_bool_parms *bool_parms = parms; + rset_bool_parms *bool_parms = (rset_bool_parms *) parms; struct rset_bool_info *info; - info = xmalloc (sizeof(*info)); + info = (struct rset_bool_info *) xmalloc (sizeof(*info)); info->key_size = bool_parms->key_size; info->rset_l = bool_parms->rset_l; info->rset_r = bool_parms->rset_r; @@ -160,7 +124,8 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) info->term_index_s = info->rset_l->no_rset_terms; ct->no_rset_terms = info->rset_l->no_rset_terms + info->rset_r->no_rset_terms; - ct->rset_terms = xmalloc (sizeof (*ct->rset_terms) * ct->no_rset_terms); + ct->rset_terms = (RSET_TERM *) + xmalloc (sizeof (*ct->rset_terms) * ct->no_rset_terms); memcpy (ct->rset_terms, info->rset_l->rset_terms, info->rset_l->no_rset_terms * sizeof(*ct->rset_terms)); @@ -172,7 +137,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) static RSFD r_open (RSET ct, int flag) { - struct rset_bool_info *info = ct->buf; + struct rset_bool_info *info = (struct rset_bool_info *) ct->buf; struct rset_bool_rfd *rfd; if (flag & RSETF_WRITE) @@ -180,7 +145,7 @@ static RSFD r_open (RSET ct, int flag) logf (LOG_FATAL, "bool set type is read-only"); return NULL; } - rfd = xmalloc (sizeof(*rfd)); + rfd = (struct rset_bool_rfd *) xmalloc (sizeof(*rfd)); rfd->next = info->rfd_list; info->rfd_list = rfd; rfd->info = info; @@ -218,7 +183,7 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { - struct rset_bool_info *info = ct->buf; + struct rset_bool_info *info = (struct rset_bool_info *) ct->buf; assert (info->rfd_list == NULL); xfree (ct->rset_terms); @@ -230,7 +195,7 @@ static void r_delete (RSET ct) static void r_rewind (RSFD rfd) { struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info; - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; logf (LOG_DEBUG, "rsbool_rewind"); rset_rewind (info->rset_l, p->rfd_l); @@ -246,7 +211,7 @@ static int r_count (RSET ct) static int r_read_and (RSFD rfd, void *buf, int *term_index) { - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; while (p->more_l && p->more_r) @@ -288,12 +253,18 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index) p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l); } + while (p->more_l) + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, + &p->term_index_l); + while (p->more_r) + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, + &p->term_index_r); return 0; } static int r_read_or (RSFD rfd, void *buf, int *term_index) { - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; while (p->more_l || p->more_r) @@ -338,7 +309,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index) static int r_read_not (RSFD rfd, void *buf, int *term_index) { - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; while (p->more_l || p->more_r)