X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisam.c;h=b2ad821ac2007911a9487b363cba9eef363b6106;hb=3db15cf883ad80b6a4b0e960f3c3b59c86b59c6b;hp=249a7636622a775ef2d07ef16a199c54f6265801;hpb=5c7ad71f534d092eaf97f04dd39c5e874e0d45b0;p=idzebra-moved-to-github.git

diff --git a/rset/rsisam.c b/rset/rsisam.c
index 249a763..b2ad821 100644
--- a/rset/rsisam.c
+++ b/rset/rsisam.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisam.c,v $
- * Revision 1.13  1995-10-12 12:41:56  adam
+ * Revision 1.17  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.16  1997/10/31 12:37:01  adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.15  1996/10/29 13:55:22  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.14  1995/12/11 09:15:24  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.
+ * New rset member: flag.
+ * Bug fix: r_delete in rsrel.c did free bad memory block.
+ *
+ * Revision 1.13  1995/10/12  12:41:56  adam
  * Private info (buf) moved from struct rset_control to struct rset.
  * Bug fixes in relevance.
  *
@@ -49,27 +67,30 @@
 #include <stdio.h>
 #include <assert.h>
 #include <rsisam.h>
-#include <alexutil.h>
+#include <zebrautl.h>
 
-static void *r_create(const struct rset_control *sel, void *parms);
+static void *r_create(const struct rset_control *sel, void *parms,
+                      int *flags);
 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_hits (RSET ct, void *oi);
 static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 static int r_score (RSFD rfd, int *score);
 
 static const rset_control control = 
 {
-    "ISAM set type",
+    "isam",
     r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read,
     r_write,
     r_score
@@ -89,11 +110,13 @@ struct rset_isam_info {
     struct rset_ispt_info *ispt_list;
 };
 
-static void *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(const struct rset_control *sel, void *parms,
+                      int *flags)
 {
     rset_isam_parms *pt = parms;
     struct rset_isam_info *info;
 
+    *flags |= RSET_FLAG_VOLATILE;
     info = xmalloc (sizeof(struct rset_isam_info));
     info->is = pt->is;
     info->pos = pt->pos;
@@ -130,7 +153,7 @@ static void r_close (RSFD rfd)
         {
             is_pt_free ((*ptinfop)->pt);
             *ptinfop = (*ptinfop)->next;
-            free (rfd);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -157,6 +180,11 @@ static int r_count (RSET ct)
     return 0;
 }
 
+static int r_hits (RSET ct, void *oi)
+{
+    return -1;
+}
+
 static int r_read (RSFD rfd, void *buf)
 {
     return is_readkey( ((struct rset_ispt_info*) rfd)->pt, buf);