Fixed bug in zebraIndexUnlock. On NT, the lock files wasn't removed.

[idzebra-moved-to-github.git] / rset / rsisam.c

diff --git a/rset/rsisam.c b/rset/rsisam.c
index 2bdd745..b2ad821 100644 (file)
--- a/rset/rsisam.c
+++ b/rset/rsisam.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisam.c,v $
- * Revision 1.14  1995-12-11 09:15:24  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.
@@ -56,7 +67,7 @@
 #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,
                       int *flags);
@@ -65,6 +76,7 @@ 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);
@@ -78,6 +90,7 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read,
     r_write,
     r_score
@@ -140,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!");
@@ -167,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);