X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=ae1dd371d24f8eb2601665dbb882631e5532bb9c;hb=0229bb1ac74706a4e460a11a8a8712b4ea0f2ebe;hp=48dfb65a4b8e1de34a924a748025acd2461236aa;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git diff --git a/include/rset.h b/include/rset.h index 48dfb65..ae1dd37 100644 --- a/include/rset.h +++ b/include/rset.h @@ -1,4 +1,4 @@ -/* $Id: rset.h,v 1.34 2004-09-09 10:08:04 heikki Exp $ +/* $Id: rset.h,v 1.37 2004-10-15 10:07:32 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -40,6 +40,14 @@ extern "C" { typedef struct rsfd *RSFD; /* Rset "file descriptor" */ typedef struct rset *RSET; /* Result set */ +/* +typedef struct terminfo *TERMID; +*/ +typedef int TERMID; + /* term thing for the rsets. They don't need to */ + /* know what it is. FIXME - define that somewhere */ +/* using int while testing, to get more type checking to work */ + struct rsfd { /* the stuff common to all rsfd's. */ RSET rset; /* ptr to the rset this FD is opened to */ void *priv; /* private parameters for this type */ @@ -54,15 +62,14 @@ struct rset_control void (*f_delete)(RSET ct); RSFD (*f_open)(RSET ct, int wflag); void (*f_close)(RSFD rfd); - void (*f_rewind)(RSFD rfd); - int (*f_forward)(RSFD rfd, void *buf, const void *untilbuf); + int (*f_forward)(RSFD rfd, void *buf, TERMID *term, const void *untilbuf); void (*f_pos)(RSFD rfd, double *current, double *total); /* returns -1,-1 if pos function not implemented for this type */ - int (*f_read)(RSFD rfd, void *buf); + int (*f_read)(RSFD rfd, void *buf, TERMID *term); int (*f_write)(RSFD rfd, const void *buf); }; -int rset_default_forward(RSFD rfd, void *buf, +int rset_default_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf); struct key_control { @@ -88,6 +95,7 @@ typedef struct rset /* 1 if created with it, 0 if passed from above */ RSFD free_list; /* all rfd's allocated but not currently in use */ int scope; /* On what level do we count hits and compare them? */ + TERMID term; /* the term thing for ranking etc */ } rset; /* rset is a "virtual base class", which will never exist on its own * all instances are rsets of some specific type, like rsisamb, or rsbool @@ -105,9 +113,6 @@ typedef struct rset * occurences, whereas if we are only counting hits, we do not need anything * below the scope. Again 1 is seqnos, 2 sysnos (or verses), 3 books, etc. */ -/* FIXME - Add a resolution, to decide on what level we want to return */ -/* hits. That can well be below scope, if we need to get seqnos for prox */ -/* or suchlike... */ RSFD rfd_create_base(RSET rs); void rfd_delete_base(RSFD rfd); @@ -115,7 +120,9 @@ void rfd_delete_base(RSFD rfd); RSET rset_create_base(const struct rset_control *sel, NMEM nmem, const struct key_control *kcontrol, - int scope ); + int scope, + TERMID term); + void rset_delete(RSET rs); RSET rset_dup (RSET rs); @@ -128,19 +135,17 @@ RSET rset_dup (RSET rs); /* void rset_close(RSFD rfd); */ #define rset_close(rfd) (*(rfd)->rset->control->f_close)(rfd) -/* void rset_rewind(RSFD rfd); */ -#define rset_rewind(rfd) (*(rfd)->rset->control->f_rewind)((rfd)) - -/* int rset_forward(RSFD rfd, void *buf, void *untilbuf); */ -#define rset_forward(rfd, buf, untilbuf) \ - (*(rfd)->rset->control->f_forward)((rfd),(buf),(untilbuf)) +/* int rset_forward(RSFD rfd, void *buf, TERMID term, void *untilbuf); */ +#define rset_forward(rfd, buf, term, untilbuf) \ + (*(rfd)->rset->control->f_forward)((rfd),(buf),(term),(untilbuf)) /* int rset_pos(RSFD fd, double *current, double *total); */ #define rset_pos(rfd,cur,tot) \ (*(rfd)->rset->control->f_pos)( (rfd),(cur),(tot)) -/* int rset_read(RSFD rfd, void *buf); */ -#define rset_read(rfd, buf) (*(rfd)->rset->control->f_read)((rfd), (buf)) +/* int rset_read(RSFD rfd, void *buf, TERMID term); */ +#define rset_read(rfd, buf, term) \ + (*(rfd)->rset->control->f_read)((rfd), (buf), (term)) /* int rset_write(RSFD rfd, const void *buf); */ #define rset_write(rfd, buf) (*(rfd)->rset->control->f_write)((rfd), (buf)) @@ -166,14 +171,18 @@ RSET rsbool_create_not( NMEM nmem, const struct key_control *kcontrol, int scope, RSET rset_l, RSET rset_r); -RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol, +RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol, int scope, RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr); -RSET rsmultior_create( NMEM nmem, const struct key_control *kcontrol, +RSET rsmultior_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + int no_rsets, RSET* rsets); + +RSET rsmultiand_create( NMEM nmem, const struct key_control *kcontrol, int scope, - int no_rsets, RSET* rsets); + int no_rsets, RSET* rsets); RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope, @@ -183,15 +192,18 @@ RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope, - ISAMB is, ISAMB_P pos); + ISAMB is, ISAMB_P pos, + TERMID term); RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope, - ISAMC is, ISAMC_P pos); + ISAMC is, ISAMC_P pos, + TERMID term); RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope, - ISAMS is, ISAMS_P pos); + ISAMS is, ISAMS_P pos, + TERMID term);