X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=39f9ec13cb177a59d98927ff9321ec777fcf3f44;hb=d195e3229385349f842d2f82b65ad8118d64aec5;hp=b7f2ba6d4d2592fa2e9ff9325ca687bb00ce45d1;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index b7f2ba6..39f9ec1 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.47 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsbool.c,v 1.51 2004-11-19 10:27:14 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -35,21 +35,22 @@ 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 void r_rewind (RSFD rfd);
-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 void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm);
+
 
 static const struct rset_control control_and = 
 {
     "and",
     r_delete,
+    r_get_terms,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,    
     r_read_and,
@@ -60,9 +61,9 @@ static const struct rset_control control_or =
 {
     "or",
     r_delete,
+    r_get_terms,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,
     r_read_or,
@@ -73,9 +74,9 @@ static const struct rset_control control_not =
 {
     "not",
     r_delete,
+    r_get_terms,
     r_open,
     r_close,
-    r_rewind,
     r_forward, 
     r_pos,
     r_read_not,
@@ -100,6 +101,8 @@ struct rset_bool_rfd {
     int  more_r;
     void *buf_l;
     void *buf_r;
+    TERMID term_l;
+    TERMID term_r;
     int tail;
 };    
 
@@ -108,7 +111,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;
@@ -162,7 +165,7 @@ static RSFD r_open (RSET ct, int flag)
 
     if (flag & RSETF_WRITE)
     {
-        logf (LOG_FATAL, "bool set type is read-only");
+        yaz_log (YLOG_FATAL, "bool set type is read-only");
         return NULL;
     }
     rfd = rfd_create_base(ct);
@@ -175,13 +178,13 @@ static RSFD r_open (RSET ct, int flag)
         p->buf_r = nmem_malloc(ct->nmem, ct->keycontrol->key_size);
     }
 
-    logf(LOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd);
+    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->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;
 }
@@ -197,31 +200,19 @@ static void r_close (RSFD rfd)
 }
 
 
-static void r_rewind (RSFD rfd)
-{
- /* struct rset_bool_info *info = (struct rset_bool_info*)(rfd->rset->priv); */
-    struct rset_bool_rfd *p=(struct rset_bool_rfd *)rfd->priv;
-
-    logf (LOG_DEBUG, "rsbool_rewind");
-    rset_rewind (p->rfd_l);
-    rset_rewind (p->rfd_r);
-    p->more_l = rset_read (p->rfd_l, p->buf_l);
-    p->more_r = rset_read (p->rfd_r, p->buf_r);
-    p->hits=0;
-}
 
-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); 
 }
 
 
@@ -240,7 +231,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;
@@ -256,27 +247,31 @@ static int r_read_and (RSFD rfd, void *buf)
         else
             cmp = rfd->rset->scope;
 #if RSET_DEBUG
-        logf (LOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
+        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)(LOG_DEBUG, p->buf_l, "left ");
-        (*kctrl->log_item)(LOG_DEBUG, p->buf_r, "right ");
+        (*kctrl->log_item)(YLOG_DEBUG, p->buf_l, "left ");
+        (*kctrl->log_item)(YLOG_DEBUG, p->buf_r, "right ");
 #endif
         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",
+            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(LOG_DEBUG,buf);
-            (*kctrl->log_item)(LOG_DEBUG, buf, "");
+            key_logdump(YLOG_DEBUG,buf);
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -284,12 +279,14 @@ 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",
+            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)(LOG_DEBUG, buf, "");
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -299,13 +296,15 @@ 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
-                logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
+                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)(LOG_DEBUG, buf, "");
+                (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
                 p->hits++;
                 return 1;
@@ -313,12 +312,13 @@ static int r_read_and (RSFD rfd, void *buf)
             else
             {
 #if RSET_DEBUG
-                logf (LOG_DEBUG, "r_read_and [%p] about to forward R "
+                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->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 */
             }
@@ -328,13 +328,15 @@ 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
-                logf (LOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
+                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)(LOG_DEBUG, buf, "");
+                (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
                 p->hits++;
                 return 1;
@@ -342,24 +344,25 @@ static int r_read_and (RSFD rfd, void *buf)
             else
             {
 #if RSET_DEBUG
-                logf (LOG_DEBUG, "r_read_and [%p] about to forward L "
+                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->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 */
             }
         }
     }
 #if RSET_DEBUG
-    logf (LOG_DEBUG, "r_read_and [%p] reached its end",rfd);
+    yaz_log (YLOG_DEBUG, "r_read_and [%p] reached its end",rfd);
 #endif
     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;
@@ -377,12 +380,17 @@ 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",
+            yaz_log (YLOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
-            (*kctrl->log_item)(LOG_DEBUG, buf, "");
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -390,11 +398,13 @@ 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",
+            yaz_log (YLOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
-            (*kctrl->log_item)(LOG_DEBUG, buf, "");
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -402,11 +412,13 @@ 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",
+            yaz_log (YLOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
-            (*kctrl->log_item)(LOG_DEBUG, buf, "");
+            (*kctrl->log_item)(YLOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -415,7 +427,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;
@@ -434,18 +446,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);
@@ -453,7 +470,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);
@@ -467,7 +484,7 @@ static int r_read_not (RSFD rfd, void *buf)
 
 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;
 }
 
@@ -495,8 +512,16 @@ static void r_pos (RSFD rfd, double *current, double *total)
     *current=(double) (p->hits);
     *total=*current/r ; 
 #if RSET_DEBUG
-    yaz_log(LOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ",
+    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);
+}
+