X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=rset%2Frsbool.c;h=ba61fc627db6fe75b05da2aaed0c393264af8d12;hb=0245f556af399689056b7810ed0e3de93021ad4a;hp=e2bec06ef7b287352b751b7e1307d439bf7ee60c;hpb=a322231bcd4bfed2886c571aa91da5f73cad62a9;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index e2bec06..ba61fc6 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsbool.c,v $
- * Revision 1.3  1995-09-07 13:58:43  adam
+ * 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
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.5  1995/09/08  14:52:41  adam
+ * Work on relevance feedback.
+ *
+ * Revision 1.4  1995/09/08  08:54:04  adam
+ * More efficient and operation.
+ *
+ * Revision 1.3  1995/09/07  13:58:43  adam
  * New parameter: result-set file descriptor (RSFD) to support multiple
  * positions within the same result-set.
  * Boolean operators: and, or, not implemented.
@@ -24,7 +37,7 @@
 #include <alexutil.h>
 
 static rset_control *r_create(const struct rset_control *sel, void *parms);
-static RSFD r_open (rset_control *ct, int wflag);
+static RSFD r_open (rset_control *ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (rset_control *ct);
 static void r_rewind (RSFD rfd);
@@ -33,6 +46,7 @@ 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);
 static int r_write (RSFD rfd, const void *buf);
+static int r_score (RSFD rfd, int *score);
 
 static const rset_control control_and = 
 {
@@ -45,7 +59,8 @@ static const rset_control control_and =
     r_rewind,
     r_count,
     r_read_and,
-    r_write
+    r_write,
+    r_score
 };
 
 static const rset_control control_or = 
@@ -59,7 +74,8 @@ static const rset_control control_or =
     r_rewind,
     r_count,
     r_read_or,
-    r_write
+    r_write,
+    r_score
 };
 
 static const rset_control control_not = 
@@ -73,7 +89,8 @@ static const rset_control control_not =
     r_rewind,
     r_count,
     r_read_not,
-    r_write
+    r_write,
+    r_score
 };
 
 
@@ -106,7 +123,6 @@ static rset_control *r_create (const struct rset_control *sel, void *parms)
     rset_bool_parms *bool_parms = parms;
     struct rset_bool_info *info;
 
-    logf (LOG_DEBUG, "rsbool_create(%s)", sel->desc);
     newct = xmalloc(sizeof(*newct));
     memcpy (newct, sel, sizeof(*sel));
     newct->buf = xmalloc (sizeof(struct rset_bool_info));
@@ -119,12 +135,12 @@ static rset_control *r_create (const struct rset_control *sel, void *parms)
     return newct;
 }
 
-static RSFD r_open (rset_control *ct, int wflag)
+static RSFD r_open (rset_control *ct, int flag)
 {
     struct rset_bool_info *info = ct->buf;
     struct rset_bool_rfd *rfd;
 
-    if (wflag)
+    if (flag & RSETF_WRITE)
     {
 	logf (LOG_FATAL, "bool set type is read-only");
 	return NULL;
@@ -135,8 +151,8 @@ static RSFD r_open (rset_control *ct, int wflag)
 
     rfd->buf_l = xmalloc (info->key_size);
     rfd->buf_r = xmalloc (info->key_size);
-    rfd->rfd_l = rset_open (info->rset_l, wflag);
-    rfd->rfd_r = rset_open (info->rset_r, wflag);
+    rfd->rfd_l = rset_open (info->rset_l, flag);
+    rfd->rfd_r = rset_open (info->rset_r, flag);
     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;
@@ -194,16 +210,11 @@ static int r_read_and (RSFD rfd, void *buf)
     struct rset_bool_rfd *p = rfd;
     struct rset_bool_info *info = p->info;
 
-    while (p->more_l || p->more_r)
+    while (p->more_l && p->more_r)
     {
         int cmp;
 
-        if (p->more_l && p->more_r)
-            cmp = (*info->cmp)(p->buf_l, p->buf_r);
-        else if (p->more_r)
-            cmp = 2;
-        else
-            cmp = -2;
+        cmp = (*info->cmp)(p->buf_l, p->buf_r);
         if (!cmp)
         {
             memcpy (buf, p->buf_l, info->key_size);
@@ -320,3 +331,10 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "bool set type is read-only");
     return -1;
 }
+
+static int r_score (RSFD rfd, int *score)
+{
+    *score = -1;
+    return -1;
+}
+