New method result set method rs_hits that returns the number of

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

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index cc3bf0e..fb429ad 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsisamc.c,v $
- * Revision 1.1  1996-10-29 13:41:48  adam
+ * Revision 1.4  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.3  1997/10/31 12:37:01  adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.2  1996/11/08 11:15:57  adam
+ * Compressed isam fully supported.
+ *
+ * Revision 1.1  1996/10/29 13:41:48  adam
  * First use of isamc.
  *
  */
@@ -21,6 +32,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);
@@ -34,6 +46,7 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read,
     r_write,
     r_score
@@ -96,7 +109,7 @@ static void r_close (RSFD rfd)
         {
             isc_pp_close ((*ptinfop)->pt);
             *ptinfop = (*ptinfop)->next;
-            free (rfd);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -123,9 +136,14 @@ 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 isc_read_key( ((struct rset_pp_info*) rfd)->pt, buf);
+    return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
 }
 
 static int r_write (RSFD rfd, const void *buf)