Remove the obsolete rset public control variables. WS updates.

[idzebra-moved-to-github.git] / include / rset.h

diff --git a/include/rset.h b/include/rset.h
index ec09bad..ff86cd9 100644 (file)
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.45 2005-01-15 20:47:15 adam Exp $
+/* $Id: rset.h,v 1.50 2005-04-26 10:09:38 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -23,8 +23,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef RSET_H
 #define RSET_H
 
-#include <stddef.h>
-
+#include <yaz/yaz-util.h>
 /* unfortunately we need the isam includes here, for the arguments for */
 /* rsisamX_create */
 #include <idzebra/isamb.h> 
@@ -56,9 +55,7 @@ struct rset_term {
 
 typedef struct rset_term *TERMID; 
 TERMID rset_term_create (const char *name, int length, const char *flags,
-                                    int type, NMEM nmem);
-
-
+                        int type, NMEM nmem);
 
 /** rsfd is a "file descriptor" for reading from a rset */
 struct rsfd {  /* the stuff common to all rsfd's. */
@@ -144,6 +141,7 @@ typedef struct rset
     char my_nmem; /* Should the nmem be destroyed with the rset?  */
                   /* 1 if created with it, 0 if passed from above */
     RSFD free_list; /* all rfd's allocated but not currently in use */
+    RSFD use_list;  /* all rfd's in use */
     int scope;    /* On what level do we count hits and compare them? */
     TERMID term; /* the term thing for ranking etc */
 } rset;
@@ -166,6 +164,7 @@ typedef struct rset
 
 RSFD rfd_create_base(RSET rs);
 void rfd_delete_base(RSFD rfd);
+int rfd_is_last(RSFD rfd);
 
 RSET rset_create_base(const struct rset_control *sel, 
                       NMEM nmem,
@@ -211,8 +210,7 @@ RSET rset_dup (RSET rs);
 zint rset_count(RSET rs);
 
 RSET rstemp_create(NMEM nmem, const struct key_control *kcontrol,
-                    int scope, 
-                    const char *temp_path, TERMID term);
+                    int scope, const char *temp_path, TERMID term);
 
 RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol);
 
@@ -240,13 +238,13 @@ RSET rsprox_create(NMEM nmem, const struct key_control *kcontrol,
                   int ordered, int exclusion, int relation, int distance);
 
 RSET rsisamb_create(NMEM nmem, const struct key_control *kcontrol,
-                   int scope, ISAMB is, ISAMB_P pos, TERMID term);
+                   int scope, ISAMB is, ISAM_P pos, TERMID term);
 
 RSET rsisamc_create(NMEM nmem, const struct key_control *kcontrol,
-                   int scope, ISAMC is, ISAMC_P pos, TERMID term);
+                   int scope, ISAMC is, ISAM_P pos, TERMID term);
 
 RSET rsisams_create(NMEM nmem, const struct key_control *kcontrol,
-                   int scope, ISAMS is, ISAMS_P pos, TERMID term);
+                   int scope, ISAMS is, ISAM_P pos, TERMID term);
 
 
 YAZ_END_CDECL