X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsnull.c;h=23d6d493ce0944455b969435db69f3f6fbb701b8;hb=6b0310a64df542131c2f4abded39f35844235e4d;hp=fd98d300dfed3589852dfa67be31d3d4371e4e74;hpb=7b0a5daa703117cde2dc0d54d5a39941a1c01ce8;p=idzebra-moved-to-github.git diff --git a/rset/rsnull.c b/rset/rsnull.c index fd98d30..23d6d49 100644 --- a/rset/rsnull.c +++ b/rset/rsnull.c @@ -1,10 +1,27 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsnull.c,v $ - * Revision 1.7 1995-12-11 09:15:25 adam + * Revision 1.12 1999-05-26 07:49:14 adam + * C++ compilation. + * + * Revision 1.11 1999/02/02 14:51:36 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.10 1998/03/05 08:36:28 adam + * New result set model. + * + * Revision 1.9 1997/12/18 10:54:25 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.8 1996/10/29 13:55:24 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.7 1995/12/11 09:15:25 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. @@ -37,20 +54,18 @@ #include #include -#include +#include -static void *r_create(const struct rset_control *sel, void *parms, - int *flags); +static void *r_create(RSET ct, const struct rset_control *sel, void *parms); 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_count (RSET ct); -static int r_read (RSFD rfd, void *buf); +static int r_read (RSFD rfd, void *buf, int *term_index); static int r_write (RSFD rfd, const void *buf); -static int r_score (RSFD rfd, int *score); -static const rset_control control = +static const struct rset_control control = { "null", r_create, @@ -61,14 +76,22 @@ static const rset_control control = r_count, r_read, r_write, - r_score }; -const rset_control *rset_kind_null = &control; +const struct rset_control *rset_kind_null = &control; -static void *r_create(const struct rset_control *sel, void *parms, - int *flags) +static void *r_create(RSET ct, const struct rset_control *sel, void *parms) { + rset_null_parms *null_parms = (rset_null_parms *) parms; + + ct->no_rset_terms = 1; + ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms)); + if (parms) + ct->rset_terms[0] = null_parms->rset_term; + else + ct->rset_terms[0] = rset_term_create ("term", -1, "rank-0"); + ct->rset_terms[0]->nn = 0; + return NULL; } @@ -88,6 +111,8 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { + rset_term_destroy (ct->rset_terms[0]); + xfree (ct->rset_terms); } static void r_rewind (RSFD rfd) @@ -100,8 +125,9 @@ static int r_count (RSET ct) return 0; } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, int *term_index) { + *term_index = -1; return 0; } @@ -111,9 +137,3 @@ static int r_write (RSFD rfd, const void *buf) return -1; } -static int r_score (RSFD rfd, int *score) -{ - *score = -1; - return -1; -} -