X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Frset.h;h=5e8df1aa9a24c3ba368d32f836dd7ac46c1d0fac;hb=49d0ee122a9f86ec2967b577dcc297c501785edd;hp=0352a1c09b9c2db836ea11e9c740405897bcb27b;hpb=8add234f71c852fd95ca3aef168e3563265c93b9;p=idzebra-moved-to-github.git

diff --git a/include/rset.h b/include/rset.h
index 0352a1c..5e8df1a 100644
--- a/include/rset.h
+++ b/include/rset.h
@@ -1,4 +1,4 @@
-/* $Id: rset.h,v 1.46 2005-01-16 23:14:56 adam Exp $
+/* $Id: rset.h,v 1.49 2005-04-15 10:47:48 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -23,6 +23,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef RSET_H
 #define RSET_H
 
+#include <yaz/yaz-util.h>
 /* unfortunately we need the isam includes here, for the arguments for */
 /* rsisamX_create */
 #include <idzebra/isamb.h> 
@@ -142,6 +143,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;
@@ -164,6 +166,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,
@@ -238,13 +241,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