X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=2a363f1efc6b29110f9c3e9229a2e5d320e81d24;hb=067b55382bc9916b3f7dcd473512c703d4de4a5d;hp=ba61fc627db6fe75b05da2aaed0c393264af8d12;hpb=0245f556af399689056b7810ed0e3de93021ad4a;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index ba61fc6..2a363f1 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsbool.c,v $
- * Revision 1.7  1995-10-10 14:00:03  adam
+ * 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.
+ * New rset member: flag.
+ * Bug fix: r_delete in rsrel.c did free bad memory block.
+ *
+ * Revision 1.8  1995/10/12  12:41:55  adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.7  1995/10/10  14:00:03  adam
  * Function rset_open changed its wflag parameter to general flags.
  *
  * Revision 1.6  1995/10/06  14:38:05  adam
@@ -31,17 +48,20 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include <rsbool.h>
-#include <alexutil.h>
+#include <zebrautl.h>
 
-static rset_control *r_create(const struct rset_control *sel, void *parms);
-static RSFD r_open (rset_control *ct, int flag);
+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_control *ct);
+static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
-static int r_count (rset_control *ct);
+static int r_count (RSET ct);
 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);
@@ -50,8 +70,7 @@ static int r_score (RSFD rfd, int *score);
 
 static const rset_control control_and = 
 {
-    "AND set type",
-    0,
+    "and",
     r_create,
     r_open,
     r_close,
@@ -65,8 +84,7 @@ static const rset_control control_and =
 
 static const rset_control control_or = 
 {
-    "OR set type",
-    0,
+    "or",
     r_create,
     r_open,
     r_close,
@@ -80,8 +98,7 @@ static const rset_control control_or =
 
 static const rset_control control_not = 
 {
-    "NOT set type",
-    0,
+    "not",
     r_create,
     r_open,
     r_close,
@@ -117,25 +134,24 @@ struct rset_bool_rfd {
     struct rset_bool_info *info;
 };    
 
-static rset_control *r_create (const struct rset_control *sel, void *parms)
+static void *r_create (const struct rset_control *sel, void *parms,
+                       int *flags)
 {
-    rset_control *newct;
     rset_bool_parms *bool_parms = parms;
     struct rset_bool_info *info;
 
-    newct = xmalloc(sizeof(*newct));
-    memcpy (newct, sel, sizeof(*sel));
-    newct->buf = xmalloc (sizeof(struct rset_bool_info));
-    info = (struct rset_bool_info*) newct->buf;
+    info = xmalloc (sizeof(*info));
     info->key_size = bool_parms->key_size;
     info->rset_l = bool_parms->rset_l;
     info->rset_r = bool_parms->rset_r;
+    if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r))
+        *flags |= RSET_FLAG_VOLATILE;
     info->cmp = bool_parms->cmp;
     info->rfd_list = NULL;
-    return newct;
+    return info;
 }
 
-static RSFD r_open (rset_control *ct, int flag)
+static RSFD r_open (RSET ct, int flag)
 {
     struct rset_bool_info *info = ct->buf;
     struct rset_bool_rfd *rfd;
@@ -148,14 +164,14 @@ static RSFD r_open (rset_control *ct, int flag)
     rfd = xmalloc (sizeof(*rfd));
     rfd->next = info->rfd_list;
     info->rfd_list = rfd;
+    rfd->info = info;
 
     rfd->buf_l = xmalloc (info->key_size);
     rfd->buf_r = xmalloc (info->key_size);
-    rfd->rfd_l = rset_open (info->rset_l, flag);
-    rfd->rfd_r = rset_open (info->rset_r, flag);
+    rfd->rfd_l = rset_open (info->rset_l, RSETF_READ|RSETF_SORT_SYSNO);
+    rfd->rfd_r = rset_open (info->rset_r, RSETF_READ|RSETF_SORT_SYSNO);
     rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l);
     rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r);
-    rfd->info = info;
     return rfd;
 }
 
@@ -179,13 +195,14 @@ static void r_close (RSFD rfd)
     assert (0);
 }
 
-static void r_delete (rset_control *ct)
+static void r_delete (RSET ct)
 {
     struct rset_bool_info *info = ct->buf;
 
     assert (info->rfd_list == NULL);
+    rset_delete (info->rset_l);
+    rset_delete (info->rset_r);
     xfree (info);
-    xfree (ct);
 }
 
 static void r_rewind (RSFD rfd)
@@ -200,7 +217,7 @@ static void r_rewind (RSFD rfd)
     p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
 }
 
-static int r_count (rset_control *ct)
+static int r_count (RSET ct)
 {
     return 0;
 }