X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=568a937894833c5093b3fc9859103f326df28867;hb=96810973bbdcdec7019b22fc26aaffddac2cb70d;hp=df2c5e417196f46313fcd7b53fd61f99c31b3637;hpb=7b0a5daa703117cde2dc0d54d5a39941a1c01ce8;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index df2c5e4..568a937 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsbool.c,v $
- * Revision 1.9  1995-12-11 09:15:22  adam
+ * Revision 1.13  1997-12-18 10:54:24  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.12  1997/10/31 12:37:01  adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.11  1997/09/09 13:38:15  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.10  1996/10/29 13:55:20  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.9  1995/12/11 09:15:22  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.
@@ -42,10 +56,12 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include <rsbool.h>
-#include <alexutil.h>
+#include <zebrautl.h>
 
 static void *r_create(const struct rset_control *sel, void *parms,
                       int *flags);
@@ -54,6 +70,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_and (RSFD rfd, void *buf);
 static int r_read_or (RSFD rfd, void *buf);
 static int r_read_not (RSFD rfd, void *buf);
@@ -69,6 +86,7 @@ static const rset_control control_and =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read_and,
     r_write,
     r_score
@@ -83,6 +101,7 @@ static const rset_control control_or =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read_or,
     r_write,
     r_score
@@ -97,6 +116,7 @@ static const rset_control control_not =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read_not,
     r_write,
     r_score
@@ -180,7 +200,7 @@ static void r_close (RSFD rfd)
             rset_close (info->rset_l, (*rfdp)->rfd_l);
             rset_close (info->rset_r, (*rfdp)->rfd_r);
             *rfdp = (*rfdp)->next;
-            free (rfd);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -214,6 +234,11 @@ static int r_count (RSET ct)
     return 0;
 }
 
+static int r_hits (RSET ct, void *oi)
+{
+    return -1;
+}
+
 static int r_read_and (RSFD rfd, void *buf)
 {
     struct rset_bool_rfd *p = rfd;