X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=aa61ba34efce632859dfdc336c851fc7fffbe301;hb=bfaff2a3d97a1980b3318fedf628222ebf1a7225;hp=2ecf7e07c2977832d5035fb1bc7c3f791f0ebe03;hpb=70961362d71c04daaf0b0feafe59e78d235eb116;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index 2ecf7e0..aa61ba3 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsm_or.c,v $
- * Revision 1.2  1996-12-23 15:30:49  adam
+ * Revision 1.5  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.4  1997/10/31 12:37:55  adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.3  1997/09/09 13:38:16  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.2  1996/12/23 15:30:49  adam
  * Work on truncation.
  *
  * Revision 1.1  1996/12/20 11:07:21  adam
@@ -12,9 +23,10 @@
  *
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <string.h>
 
 #include <isam.h>
 #include <isamc.h>
@@ -28,6 +40,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);
@@ -41,6 +54,7 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read,
     r_write,
     r_score
@@ -243,8 +257,8 @@ static void r_close (RSFD rfd)
             for (i = 0; i<info->no_isam_positions; i++)
                 if (((struct rset_mor_rfd *) rfd)->ispt[i])
                     isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[i]);
-            free (((struct rset_mor_rfd *)rfd)->ispt);
-            free (rfd);
+            xfree (((struct rset_mor_rfd *)rfd)->ispt);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -269,6 +283,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)
 {
     struct trunc_info *ti = ((struct rset_mor_rfd *) rfd)->ti;