X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbool.c;h=8dab55764ab4cd41d34032c9dd21896fef306a4d;hp=dce5eb25a29d6a54ce31f5d09f90e4a9a1acbd39;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=f1a944fbdac20e88bf55918f2a4f66c301d684e2

diff --git a/rset/rsbool.c b/rset/rsbool.c
index dce5eb2..8dab557 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,39 +1,58 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: rsbool.c,v 1.17 2002-03-20 20:24:30 adam Exp $
- */
+/* $Id: rsbool.c,v 1.52 2005-01-15 19:38:33 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include <rsbool.h>
 #include <zebrautl.h>
+#include <rset.h>
+
+#ifndef RSET_DEBUG
+#define RSET_DEBUG 0
+#endif
 
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
 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_read_and (RSFD rfd, void *buf, int *term_index);
-static int r_read_or (RSFD rfd, void *buf, int *term_index);
-static int r_read_not (RSFD rfd, void *buf, int *term_index);
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf);
+static void r_pos (RSFD rfd, double *current, double *total); 
+static int r_read_and (RSFD rfd, void *buf, TERMID *term);
+static int r_read_or (RSFD rfd, void *buf, TERMID *term);
+static int r_read_not (RSFD rfd, void *buf, TERMID *term);
 static int r_write (RSFD rfd, const void *buf);
+static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm);
+
 
 static const struct rset_control control_and = 
 {
     "and",
-    r_create,
+    r_delete,
+    r_get_terms,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
-    r_count,
+    r_forward, 
+    r_pos,    
     r_read_and,
     r_write,
 };
@@ -41,12 +60,12 @@ static const struct rset_control control_and =
 static const struct rset_control control_or = 
 {
     "or",
-    r_create,
+    r_delete,
+    r_get_terms,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
-    r_count,
+    r_forward, 
+    r_pos,
     r_read_or,
     r_write,
 };
@@ -54,282 +73,409 @@ static const struct rset_control control_or =
 static const struct rset_control control_not = 
 {
     "not",
-    r_create,
+    r_delete,
+    r_get_terms,
     r_open,
     r_close,
-    r_delete,
-    r_rewind,
-    r_count,
+    r_forward, 
+    r_pos,
     r_read_not,
     r_write,
 };
 
 
 const struct rset_control *rset_kind_and = &control_and;
-const struct rset_control *rset_kind_or = &control_or;
+const struct rset_control *rset_kind_or  = &control_or;
 const struct rset_control *rset_kind_not = &control_not;
 
 struct rset_bool_info {
-    int key_size;
     RSET rset_l;
     RSET rset_r;
-    int term_index_s;
-    int (*cmp)(const void *p1, const void *p2);
-    struct rset_bool_rfd *rfd_list;
 };
 
 struct rset_bool_rfd {
+    zint hits;
     RSFD rfd_l;
     RSFD rfd_r;
     int  more_l;
     int  more_r;
-    int term_index_l;
-    int term_index_r;
     void *buf_l;
     void *buf_r;
-    struct rset_bool_rfd *next;
-    struct rset_bool_info *info;
+    TERMID term_l;
+    TERMID term_r;
+    int tail;
 };    
 
-static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
+static RSET rsbool_create_base( const struct rset_control *ctrl,
+            NMEM nmem, const struct key_control *kcontrol,
+            int scope, 
+            RSET rset_l, RSET rset_r)
 {
-    rset_bool_parms *bool_parms = (rset_bool_parms *) parms;
+    RSET rnew=rset_create_base(ctrl, nmem, kcontrol, scope,0);
     struct rset_bool_info *info;
+    info = (struct rset_bool_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    info->rset_l = rset_l;
+    info->rset_r = rset_r;
+    rnew->priv=info;
+    return rnew;
+}
+
+
+RSET rsbool_create_and( NMEM nmem, const struct key_control *kcontrol,
+                        int scope, 
+                        RSET rset_l, RSET rset_r)
+{
+    return rsbool_create_base(rset_kind_and, nmem, kcontrol,
+                              scope,
+                              rset_l, rset_r);
+}
 
-    info = (struct rset_bool_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))
-        ct->flags |= RSET_FLAG_VOLATILE;
-    info->cmp = bool_parms->cmp;
-    info->rfd_list = NULL;
-    
-    info->term_index_s = info->rset_l->no_rset_terms;
-    ct->no_rset_terms =
-	info->rset_l->no_rset_terms + info->rset_r->no_rset_terms;
-    ct->rset_terms = (RSET_TERM *)
-	xmalloc (sizeof (*ct->rset_terms) * ct->no_rset_terms);
-
-    memcpy (ct->rset_terms, info->rset_l->rset_terms,
-	    info->rset_l->no_rset_terms * sizeof(*ct->rset_terms));
-    memcpy (ct->rset_terms + info->rset_l->no_rset_terms,
-	    info->rset_r->rset_terms,
-	    info->rset_r->no_rset_terms * sizeof(*ct->rset_terms));
-    return info;
+RSET rsbool_create_or( NMEM nmem, const struct key_control *kcontrol,
+                        int scope, 
+                       RSET rset_l, RSET rset_r)
+{
+    return rsbool_create_base(rset_kind_or, nmem, kcontrol,
+                              scope,
+                              rset_l, rset_r);
+}
+
+RSET rsbool_create_not( NMEM nmem, const struct key_control *kcontrol,
+                        int scope, 
+                        RSET rset_l, RSET rset_r)
+{
+    return rsbool_create_base(rset_kind_not, nmem, kcontrol,
+                              scope, 
+                              rset_l, rset_r);
+}
+
+static void r_delete (RSET ct)
+{
+    struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
+    rset_delete (info->rset_l);
+    rset_delete (info->rset_r);
 }
 
+
 static RSFD r_open (RSET ct, int flag)
 {
-    struct rset_bool_info *info = (struct rset_bool_info *) ct->buf;
-    struct rset_bool_rfd *rfd;
+    struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
+    RSFD rfd;
+    struct rset_bool_rfd *p;
+   
 
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "bool set type is read-only");
-	return NULL;
+        yaz_log (YLOG_FATAL, "bool set type is read-only");
+        return NULL;
     }
-    rfd = (struct rset_bool_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, RSETF_READ);
-    rfd->rfd_r = rset_open (info->rset_r, RSETF_READ);
-    rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l,
-			     &rfd->term_index_l);
-    rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r,
-			     &rfd->term_index_r);
+    rfd = rfd_create_base(ct);
+    if (rfd->priv)
+        p=(struct rset_bool_rfd *)rfd->priv;
+    else {
+        p=nmem_malloc(ct->nmem,sizeof(*p));
+        rfd->priv=p;
+        p->buf_l = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
+        p->buf_r = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
+    }
+
+    yaz_log(YLOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd);
+    p->hits=0;
+
+    p->rfd_l = rset_open (info->rset_l, RSETF_READ);
+    p->rfd_r = rset_open (info->rset_r, RSETF_READ);
+    p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+    p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+    p->tail = 0;
     return rfd;
 }
 
 static void r_close (RSFD rfd)
 {
-    struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
-    struct rset_bool_rfd **rfdp;
-    
-    for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next)
-        if (*rfdp == rfd)
-        {
-            xfree ((*rfdp)->buf_l);
-            xfree ((*rfdp)->buf_r);
-            rset_close (info->rset_l, (*rfdp)->rfd_l);
-            rset_close (info->rset_r, (*rfdp)->rfd_r);
-            *rfdp = (*rfdp)->next;
-            xfree (rfd);
-            return;
-        }
-    logf (LOG_FATAL, "r_close but no rfd match!");
-    assert (0);
+ /* struct rset_bool_info *info = (struct rset_bool_info*)(rfd->rset->priv); */
+    struct rset_bool_rfd *prfd=(struct rset_bool_rfd *)rfd->priv;
+
+    rset_close (prfd->rfd_l);
+    rset_close (prfd->rfd_r);
+    rfd_delete_base(rfd);
 }
 
-static void r_delete (RSET ct)
-{
-    struct rset_bool_info *info = (struct rset_bool_info *) ct->buf;
 
-    assert (info->rfd_list == NULL);
-    xfree (ct->rset_terms);
-    rset_delete (info->rset_l);
-    rset_delete (info->rset_r);
-    xfree (info);
-}
 
-static void r_rewind (RSFD rfd)
+static int r_forward (RSFD rfd, void *buf, TERMID *term,
+                     const void *untilbuf)
 {
-    struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
-    struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-
-    logf (LOG_DEBUG, "rsbool_rewind");
-    rset_rewind (info->rset_l, p->rfd_l);
-    rset_rewind (info->rset_r, p->rfd_r);
-    p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l);
-    p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r);
+    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+    const struct key_control *kctrl=rfd->rset->keycontrol;
+
+    if ( p->more_l && ((kctrl->cmp)(untilbuf,p->buf_l)>=rfd->rset->scope) )
+        p->more_l = rset_forward(p->rfd_l, p->buf_l, &p->term_l, untilbuf);
+    if ( p->more_r && ((kctrl->cmp)(untilbuf,p->buf_r)>=rfd->rset->scope))
+        p->more_r = rset_forward(p->rfd_r, p->buf_r, &p->term_r, untilbuf);
+    p->tail=0; 
+    return rset_read(rfd,buf,term); 
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
-static int r_read_and (RSFD rfd, void *buf, int *term_index)
+/*
+    1,1         1,3
+    1,9         2,1
+    1,11        3,1
+    2,9
+
+  1,1     1,1
+  1,3     1,3
+          1,9
+          1,11
+  2,1     2,1
+          2,9
+          3,1
+*/
+
+static int r_read_and (RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-    struct rset_bool_info *info = p->info;
+    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+    const struct key_control *kctrl=rfd->rset->keycontrol;
 
-    while (p->more_l && p->more_r)
+    while (p->more_l || p->more_r)
     {
         int cmp;
 
-        cmp = (*info->cmp)(p->buf_l, p->buf_r);
+        if (p->more_l && p->more_r)
+            cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
+        else if (p->more_l)
+            cmp = -rfd->rset->scope;
+        else
+            cmp = rfd->rset->scope;
+#if RSET_DEBUG
+        yaz_log (YLOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
+                        rfd, p->more_l, p->more_r, cmp, p->tail);
+        (*kctrl->log_item)(YLOG_DEBUG, p->buf_l, "left ");
+        (*kctrl->log_item)(YLOG_DEBUG, p->buf_r, "right ");
+#endif
         if (!cmp)
-        {
-            memcpy (buf, p->buf_l, info->key_size);
-	    *term_index = p->term_index_l;
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				   &p->term_index_l);
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
-            return 1;
+        {  /* cmp==0 */
+            memcpy (buf, p->buf_l, kctrl->key_size);
+            if (term)
+                *term=p->term_l;
+            p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+            p->tail = 1;
         }
-        else if (cmp == 1)
-        {
-            memcpy (buf, p->buf_r, info->key_size);
-
-	    *term_index = p->term_index_r + info->term_index_s;
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+        else if ( (cmp>0) && (cmp<rfd->rset->scope))
+        {  /* typically cmp == 1 */
+            memcpy (buf, p->buf_r, kctrl->key_size);
+            if (term)
+                *term=p->term_r;
+            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+            p->tail = 1;
+#if RSET_DEBUG
+            yaz_log (YLOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
+                    rfd, p->more_l, p->more_r, cmp);
+            key_logdump(YLOG_DEBUG,buf);
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+            p->hits++;
             return 1;
         }
-        else if (cmp == -1)
-        {
-            memcpy (buf, p->buf_l, info->key_size);
-	    *term_index = p->term_index_l;
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				   &p->term_index_l);
+        else if ( (cmp<0) && (-cmp<rfd->rset->scope))
+        {  /* cmp == -1 */
+            memcpy (buf, p->buf_l, kctrl->key_size);
+            if (term)
+                *term=p->term_l;
+            p->more_l = rset_read (p->rfd_l, p->buf_l,&p->term_l);
+            p->tail = 1;
+#if RSET_DEBUG
+            yaz_log (YLOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
+                    rfd, p->more_l, p->more_r, cmp);
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+            p->hits++;
             return 1;
         }
-        else if (cmp > 1)
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
-        else
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				   &p->term_index_l);
+        else if (cmp >= rfd->rset->scope )  
+        {  /* cmp == 2 */
+            if (p->tail)
+            {
+                memcpy (buf, p->buf_r, kctrl->key_size);
+                if (term)
+                    *term=p->term_r;
+                p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+                if (!p->more_r || (*kctrl->cmp)(p->buf_r, buf) > 1)
+                    p->tail = 0;
+#if RSET_DEBUG
+                yaz_log (YLOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
+                        rfd, p->more_l, p->more_r, cmp);
+                (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+                p->hits++;
+                return 1;
+            }
+            else
+            {
+#if RSET_DEBUG
+                yaz_log (YLOG_DEBUG, "r_read_and [%p] about to forward R "
+                                 "m=%d/%d c=%d",
+                        rfd, p->more_l, p->more_r, cmp);
+#endif
+                if (p->more_r && p->more_l)
+                    p->more_r = rset_forward( p->rfd_r, p->buf_r,
+                             &p->term_r, p->buf_l);
+                else 
+                    return 0; /* no point in reading further */
+            }
+        }
+        else  
+        { /* cmp == -2 */
+            if (p->tail)
+            {
+                memcpy (buf, p->buf_l, kctrl->key_size);
+                if (term)
+                    *term=p->term_l;
+                p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+                if (!p->more_l || (*kctrl->cmp)(p->buf_l, buf) > 1)
+                    p->tail = 0;
+#if RSET_DEBUG
+                yaz_log (YLOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
+                        rfd, p->more_l, p->more_r, cmp);
+                (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+                p->hits++;
+                return 1;
+            }
+            else
+            {
+#if RSET_DEBUG
+                yaz_log (YLOG_DEBUG, "r_read_and [%p] about to forward L "
+                                 "m=%d/%d c=%d",
+                        rfd, p->more_l, p->more_r, cmp);
+#endif
+                if (p->more_r && p->more_l)
+                    p->more_l = rset_forward(p->rfd_l, p->buf_l, 
+                                 &p->term_l, p->buf_r);
+                else 
+                    return 0; /* no point in reading further */
+            }
+        }
     }
+#if RSET_DEBUG
+    yaz_log (YLOG_DEBUG, "r_read_and [%p] reached its end",rfd);
+#endif
     return 0;
 }
 
-static int r_read_or (RSFD rfd, void *buf, int *term_index)
+static int r_read_or (RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-    struct rset_bool_info *info = p->info;
+    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+    const struct key_control *kctrl=rfd->rset->keycontrol;
 
     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);
+            cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
         else if (p->more_r)
-            cmp = 2;
+            cmp = rfd->rset->scope;
         else
-            cmp = -2;
+            cmp = -rfd->rset->scope;
         if (!cmp)
-        {
-            memcpy (buf, p->buf_l, info->key_size);
-	    *term_index = p->term_index_l;
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				   &p->term_index_l);
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+        { /* cmp==0 */
+            memcpy (buf, p->buf_l, kctrl->key_size);
+            if (term)
+                *term=p->term_l;
+            p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+            /* FIXME - is this right, should we not leave _r as it is */
+            /* and return that in the next read, so that ranking etc */
+            /* get to see both? */
+            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+#if RSET_DEBUG
+            yaz_log (YLOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+            p->hits++;
             return 1;
         }
         else if (cmp > 0)
         {
-            memcpy (buf, p->buf_r, info->key_size);
-	    *term_index = p->term_index_r + info->term_index_s;
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+            memcpy (buf, p->buf_r, kctrl->key_size);
+            if (term)
+                *term=p->term_r;
+            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
+#if RSET_DEBUG
+            yaz_log (YLOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+            p->hits++;
             return 1;
         }
         else
         {
-            memcpy (buf, p->buf_l, info->key_size);
-	    *term_index = p->term_index_l;
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				   &p->term_index_l);
+            memcpy (buf, p->buf_l, kctrl->key_size);
+            if (term)
+                *term=p->term_l;
+            p->more_l = rset_read ( p->rfd_l, p->buf_l, &p->term_l);
+#if RSET_DEBUG
+            yaz_log (YLOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
+#endif
+            p->hits++;
             return 1;
         }
     }
     return 0;
 }
 
-static int r_read_not (RSFD rfd, void *buf, int *term_index)
+static int r_read_not (RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-    struct rset_bool_info *info = p->info;
+    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+    const struct key_control *kctrl=rfd->rset->keycontrol;
 
     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);
+            cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
         else if (p->more_r)
-            cmp = 2;
+            cmp = rfd->rset->scope;
         else
-            cmp = -2;
-        if (cmp < -1)
-        {
-            memcpy (buf, p->buf_l, info->key_size);
-	    *term_index = p->term_index_l;
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				   &p->term_index_l);
+            cmp = -rfd->rset->scope;
+
+        if (cmp <= -rfd->rset->scope)
+        { /* cmp == -2 */
+            memcpy (buf, p->buf_l, kctrl->key_size);
+            if (term)
+                *term=p->term_l;
+            p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
+            p->hits++;
             return 1;
         }
-        else if (cmp > 1)
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+        else if (cmp >= rfd->rset->scope)   /* cmp >1 */
+            p->more_r = rset_forward( p->rfd_r, p->buf_r, 
+                          &p->term_r, p->buf_l);
         else
-        {
-            memcpy (buf, p->buf_l, info->key_size);
+        { /* cmp== -1, 0, or 1 */
+            memcpy (buf, p->buf_l, kctrl->key_size);
+            if (term)
+                *term=p->term_l;
             do
-            {
-                p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				       &p->term_index_l);
+            { 
+                p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
                 if (!p->more_l)
                     break;
-                cmp = (*info->cmp)(p->buf_l, buf);
-            } while (cmp >= -1 && cmp <= 1);
+                cmp = (*kctrl->cmp)(p->buf_l, buf);
+            } while (abs(cmp)<rfd->rset->scope);
+                /*  (cmp >= -1 && cmp <= 1) */
             do
             {
-                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				       &p->term_index_r);
+                p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
                 if (!p->more_r)
                     break;
-                cmp = (*info->cmp)(p->buf_r, buf);
-            } while (cmp >= -1 && cmp <= 1);
+                cmp = (*kctrl->cmp)(p->buf_r, buf);
+            } while (abs(cmp)<rfd->rset->scope);
+               /* (cmp >= -1 && cmp <= 1) */
         }
     }
     return 0;
@@ -338,7 +484,44 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index)
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    logf (LOG_FATAL, "bool set type is read-only");
+    yaz_log (YLOG_FATAL, "bool set type is read-only");
     return -1;
 }
 
+static void r_pos (RSFD rfd, double *current, double *total)
+{
+    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
+    double lcur,ltot;
+    double rcur,rtot;
+    double r;
+    ltot=-1; rtot=-1;
+    rset_pos(p->rfd_l,  &lcur, &ltot);
+    rset_pos(p->rfd_r,  &rcur, &rtot);
+    if ( (rtot<0) && (ltot<0)) { /*no position */
+        *current=rcur;  /* return same as you got */
+        *total=rtot;    /* probably -1 for not available */
+    }
+    if ( rtot<0) { rtot=0; rcur=0;} /* if only one useful, use it */
+    if ( ltot<0) { ltot=0; lcur=0;}
+    if ( rtot+ltot < 1 ) { /* empty rset */
+        *current=0;
+        *total=0;
+        return;
+    }
+    r=1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */
+    *current=(double) (p->hits);
+    *total=*current/r ; 
+#if RSET_DEBUG
+    yaz_log(YLOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ",
+                    info->rset_l->control->desc, info->rset_r->control->desc,
+                    *current, *total, r);
+#endif
+}
+
+static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
+{
+    struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
+    rset_getterms(info->rset_l, terms, maxterms, curterm);
+    rset_getterms(info->rset_r, terms, maxterms, curterm);
+}
+