X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=rset%2Frsbool.c;h=c9c254a5cc77fb0e8de12b6e310997f20dd3d98e;hb=40ca1d08c1d83b92e0b90951d918b252c61c63b2;hp=e2bec06ef7b287352b751b7e1307d439bf7ee60c;hpb=a322231bcd4bfed2886c571aa91da5f73cad62a9;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index e2bec06..c9c254a 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsbool.c,v $
- * Revision 1.3  1995-09-07 13:58:43  adam
+ * 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.
@@ -33,6 +43,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 +56,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 +71,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 +86,8 @@ static const rset_control control_not =
     r_rewind,
     r_count,
     r_read_not,
-    r_write
+    r_write,
+    r_score
 };
 
 
@@ -106,7 +120,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));
@@ -194,16 +207,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 +328,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;
+}
+