Passing a TERMID to rsets when creating, and getting it back when reading.

[idzebra-moved-to-github.git] / rset / rsbool.c

diff --git a/rset/rsbool.c b/rset/rsbool.c
index baf8f8f..e993ecd 100644 (file)
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.48 2004-09-30 09:53:05 heikki Exp $
+/* $Id: rsbool.c,v 1.49 2004-10-15 10:07:34 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -35,11 +35,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
-static int r_forward(RSFD rfd, void *buf, const void *untilbuf);
+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);
-static int r_read_or (RSFD rfd, void *buf);
-static int r_read_not (RSFD rfd, void *buf);
+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 const struct rset_control control_and = 
@@ -96,6 +96,8 @@ struct rset_bool_rfd {
     int  more_r;
     void *buf_l;
     void *buf_r;
+    TERMID term_l;
+    TERMID term_r;
     int tail;
 };    
 
@@ -104,7 +106,7 @@ static RSET rsbool_create_base( const struct rset_control *ctrl,
             int scope, 
             RSET rset_l, RSET rset_r)
 {
-    RSET rnew=rset_create_base(ctrl, nmem, kcontrol, scope);
+    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;
@@ -176,8 +178,8 @@ static RSFD r_open (RSET ct, int flag)
 
     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->more_r = rset_read (p->rfd_r, p->buf_r);
+    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;
 }
@@ -194,18 +196,18 @@ static void r_close (RSFD rfd)
 
 
 
-static int r_forward (RSFD rfd, void *buf,
+static int r_forward (RSFD rfd, void *buf, TERMID *term,
                      const void *untilbuf)
 {
     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, untilbuf);
+        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, untilbuf);
+        p->more_r = rset_forward(p->rfd_r, p->buf_r, &p->term_r, untilbuf);
     p->tail=0; 
-    return rset_read(rfd,buf); 
+    return rset_read(rfd,buf,term); 
 }
 
 
@@ -224,7 +226,7 @@ static int r_forward (RSFD rfd, void *buf,
           3,1
 */
 
-static int r_read_and (RSFD rfd, void *buf)
+static int r_read_and (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
     const struct key_control *kctrl=rfd->rset->keycontrol;
@@ -248,13 +250,17 @@ static int r_read_and (RSFD rfd, void *buf)
         if (!cmp)
         {  /* cmp==0 */
             memcpy (buf, p->buf_l, kctrl->key_size);
-            p->more_l = rset_read (p->rfd_l, p->buf_l);
+            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>0) && (cmp<rfd->rset->scope))
         {  /* typically cmp == 1 */
             memcpy (buf, p->buf_r, kctrl->key_size);
-            p->more_r = rset_read (p->rfd_r, p->buf_r);
+            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
             logf (LOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
@@ -268,7 +274,9 @@ static int r_read_and (RSFD rfd, void *buf)
         else if ( (cmp<0) && (-cmp<rfd->rset->scope))
         {  /* cmp == -1 */
             memcpy (buf, p->buf_l, kctrl->key_size);
-            p->more_l = rset_read (p->rfd_l, p->buf_l);
+            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
             logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
@@ -283,7 +291,9 @@ static int r_read_and (RSFD rfd, void *buf)
             if (p->tail)
             {
                 memcpy (buf, p->buf_r, kctrl->key_size);
-                p->more_r = rset_read (p->rfd_r, p->buf_r);
+                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
@@ -302,7 +312,8 @@ static int r_read_and (RSFD rfd, void *buf)
                         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->buf_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 */
             }
@@ -312,7 +323,9 @@ static int r_read_and (RSFD rfd, void *buf)
             if (p->tail)
             {
                 memcpy (buf, p->buf_l, kctrl->key_size);
-                p->more_l = rset_read (p->rfd_l, p->buf_l);
+                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
@@ -331,7 +344,8 @@ static int r_read_and (RSFD rfd, void *buf)
                         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->buf_r);
+                    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 */
             }
@@ -343,7 +357,7 @@ static int r_read_and (RSFD rfd, void *buf)
     return 0;
 }
 
-static int r_read_or (RSFD rfd, void *buf)
+static int r_read_or (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
     const struct key_control *kctrl=rfd->rset->keycontrol;
@@ -361,8 +375,13 @@ static int r_read_or (RSFD rfd, void *buf)
         if (!cmp)
         { /* cmp==0 */
             memcpy (buf, p->buf_l, kctrl->key_size);
-            p->more_l = rset_read (p->rfd_l, p->buf_l);
-            p->more_r = rset_read (p->rfd_r, p->buf_r);
+            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
             logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
@@ -374,7 +393,9 @@ static int r_read_or (RSFD rfd, void *buf)
         else if (cmp > 0)
         {
             memcpy (buf, p->buf_r, kctrl->key_size);
-            p->more_r = rset_read (p->rfd_r, p->buf_r);
+            if (term)
+                *term=p->term_r;
+            p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
 #if RSET_DEBUG
             logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
@@ -386,7 +407,9 @@ static int r_read_or (RSFD rfd, void *buf)
         else
         {
             memcpy (buf, p->buf_l, kctrl->key_size);
-            p->more_l = rset_read ( p->rfd_l, p->buf_l);
+            if (term)
+                *term=p->term_l;
+            p->more_l = rset_read ( p->rfd_l, p->buf_l, &p->term_l);
 #if RSET_DEBUG
             logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
@@ -399,7 +422,7 @@ static int r_read_or (RSFD rfd, void *buf)
     return 0;
 }
 
-static int r_read_not (RSFD rfd, void *buf)
+static int r_read_not (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
     const struct key_control *kctrl=rfd->rset->keycontrol;
@@ -418,18 +441,23 @@ static int r_read_not (RSFD rfd, void *buf)
         if (cmp <= -rfd->rset->scope)
         { /* cmp == -2 */
             memcpy (buf, p->buf_l, kctrl->key_size);
-            p->more_l = rset_read (p->rfd_l, p->buf_l);
+            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 >= rfd->rset->scope)   /* cmp >1 */
-            p->more_r = rset_forward( p->rfd_r, p->buf_r, p->buf_l);
+            p->more_r = rset_forward( p->rfd_r, p->buf_r, 
+                          &p->term_r, p->buf_l);
         else
         { /* 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 (p->rfd_l, p->buf_l);
+                p->more_l = rset_read (p->rfd_l, p->buf_l, &p->term_l);
                 if (!p->more_l)
                     break;
                 cmp = (*kctrl->cmp)(p->buf_l, buf);
@@ -437,7 +465,7 @@ static int r_read_not (RSFD rfd, void *buf)
                 /*  (cmp >= -1 && cmp <= 1) */
             do
             {
-                p->more_r = rset_read (p->rfd_r, p->buf_r);
+                p->more_r = rset_read (p->rfd_r, p->buf_r, &p->term_r);
                 if (!p->more_r)
                     break;
                 cmp = (*kctrl->cmp)(p->buf_r, buf);