X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=568a937894833c5093b3fc9859103f326df28867;hb=96810973bbdcdec7019b22fc26aaffddac2cb70d;hp=2a363f1efc6b29110f9c3e9229a2e5d320e81d24;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git diff --git a/rset/rsbool.c b/rset/rsbool.c index 2a363f1..568a937 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -4,7 +4,15 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rsbool.c,v $ - * Revision 1.11 1997-09-09 13:38:15 adam + * 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 @@ -62,6 +70,7 @@ static void r_close (RSFD rfd); static void r_delete (RSET ct); static void r_rewind (RSFD rfd); static int r_count (RSET ct); +static int r_hits (RSET ct, void *oi); 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); @@ -77,6 +86,7 @@ static const rset_control control_and = r_delete, r_rewind, r_count, + r_hits, r_read_and, r_write, r_score @@ -91,6 +101,7 @@ static const rset_control control_or = r_delete, r_rewind, r_count, + r_hits, r_read_or, r_write, r_score @@ -105,6 +116,7 @@ static const rset_control control_not = r_delete, r_rewind, r_count, + r_hits, r_read_not, r_write, r_score @@ -188,7 +200,7 @@ static void r_close (RSFD rfd) rset_close (info->rset_l, (*rfdp)->rfd_l); rset_close (info->rset_r, (*rfdp)->rfd_r); *rfdp = (*rfdp)->next; - free (rfd); + xfree (rfd); return; } logf (LOG_FATAL, "r_close but no rfd match!"); @@ -222,6 +234,11 @@ static int r_count (RSET ct) return 0; } +static int r_hits (RSET ct, void *oi) +{ + return -1; +} + static int r_read_and (RSFD rfd, void *buf) { struct rset_bool_rfd *p = rfd;