X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbool.c;h=c573e10a0bbab1e73153f082dd941f453244115c;hp=520e8596fdb5c9ff5cf49c9c49eee46c568d701b;hb=1d5d4f08cb84516d75fcb5e6ed4199b6454cccd6;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb

diff --git a/rset/rsbool.c b/rset/rsbool.c
index 520e859..c573e10 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,8 +1,5 @@
-/* $Id: rsbool.c,v 1.55 2005-05-03 09:11:36 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
 
 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
@@ -15,11 +12,14 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,48 +36,19 @@ 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, 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 void r_pos(RSFD rfd, double *current, double *total);
 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_forward, 
-    r_pos,    
-    r_read_and,
-    r_write,
-};
-
-static const struct rset_control control_or = 
-{
-    "or",
-    r_delete,
-    r_get_terms,
-    r_open,
-    r_close,
-    r_forward, 
-    r_pos,
-    r_read_or,
-    r_write,
-};
-
-static const struct rset_control control_not = 
+static const struct rset_control control_not =
 {
     "not",
     r_delete,
     r_get_terms,
     r_open,
     r_close,
-    r_forward, 
+    r_forward,
     r_pos,
     r_read_not,
     r_write,
@@ -99,15 +70,19 @@ struct rfd_private {
     TERMID term_l;
     TERMID term_r;
     int tail;
-};    
+};
 
 static RSET rsbool_create_base(const struct rset_control *ctrl,
 			       NMEM nmem,
 			       struct rset_key_control *kcontrol,
 			       int scope, RSET rset_l, RSET rset_r)
 {
-    RSET rnew = rset_create_base(ctrl, nmem, kcontrol, scope, 0);
+    RSET children[2], rnew;
     struct rset_private *info;
+
+    children[0] = rset_l;
+    children[1] = rset_r;
+    rnew = rset_create_base(ctrl, nmem, kcontrol, scope, 0, 2, children);
     info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info));
     info->rset_l = rset_l;
     info->rset_r = rset_r;
@@ -115,23 +90,8 @@ static RSET rsbool_create_base(const struct rset_control *ctrl,
     return rnew;
 }
 
-RSET rsbool_create_and( NMEM nmem, struct rset_key_control *kcontrol,
-                        int scope, RSET rset_l, RSET rset_r)
-{
-    return rsbool_create_base(&control_and, nmem, kcontrol,
-                              scope,
-                              rset_l, rset_r);
-}
-
-RSET rsbool_create_or(NMEM nmem, struct rset_key_control *kcontrol,
-                      int scope, RSET rset_l, RSET rset_r)
-{
-    return rsbool_create_base(&control_or, nmem, kcontrol,
-                              scope, rset_l, rset_r);
-}
-
-RSET rsbool_create_not(NMEM nmem, struct rset_key_control *kcontrol,
-                       int scope, RSET rset_l, RSET rset_r)
+RSET rset_create_not(NMEM nmem, struct rset_key_control *kcontrol,
+                     int scope, RSET rset_l, RSET rset_r)
 {
     return rsbool_create_base(&control_not, nmem, kcontrol,
                               scope, rset_l, rset_r);
@@ -139,9 +99,6 @@ RSET rsbool_create_not(NMEM nmem, struct rset_key_control *kcontrol,
 
 static void r_delete(RSET ct)
 {
-    struct rset_private *info = (struct rset_private *) ct->priv;
-    rset_delete (info->rset_l);
-    rset_delete (info->rset_r);
 }
 
 static RSFD r_open(RSET ct, int flag)
@@ -182,7 +139,6 @@ static void r_close (RSFD rfd)
 
     rset_close (prfd->rfd_l);
     rset_close (prfd->rfd_r);
-    rfd_delete_base(rfd);
 }
 
 static int r_forward(RSFD rfd, void *buf, TERMID *term,
@@ -195,8 +151,8 @@ static int r_forward(RSFD rfd, void *buf, TERMID *term,
         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); 
+    p->tail = 0;
+    return rset_read(rfd,buf,term);
 }
 
 
@@ -215,215 +171,17 @@ static int r_forward(RSFD rfd, void *buf, TERMID *term,
           3,1
 */
 
-static int r_read_and(RSFD rfd, void *buf, TERMID *term)
-{
-    struct rfd_private *p=(struct rfd_private *)rfd->priv;
-    const struct rset_key_control *kctrl=rfd->rset->keycontrol;
-
-    while (p->more_l || p->more_r)
-    {
-        int cmp;
-
-        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)
-        {  /* 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>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<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 >= 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, TERMID *term)
-{
-    struct rfd_private *p = (struct rfd_private *)rfd->priv;
-    const struct rset_key_control *kctrl = rfd->rset->keycontrol;
-
-    while (p->more_l || p->more_r)
-    {
-        int cmp;
-
-        if (p->more_l && p->more_r)
-            cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
-        else if (p->more_r)
-            cmp = rfd->rset->scope;
-        else
-            cmp = -rfd->rset->scope;
-        if (!cmp)
-        { /* 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, 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, 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, TERMID *term)
 {
     struct rfd_private *p = (struct rfd_private *)rfd->priv;
     const struct rset_key_control *kctrl = rfd->rset->keycontrol;
 
-    while (p->more_l || p->more_r)
+    while (p->more_l)
     {
         int cmp;
 
-        if (p->more_l && p->more_r)
+        if (p->more_r)
             cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
-        else if (p->more_r)
-            cmp = rfd->rset->scope;
         else
             cmp = -rfd->rset->scope;
 
@@ -437,15 +195,17 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term)
             return 1;
         }
         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);
+        {
+            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->term_l);
                 if (!p->more_l)
                     break;
@@ -486,18 +246,18 @@ static void r_pos(RSFD rfd, double *current, double *total)
         *current = rcur;  /* return same as you got */
         *total = rtot;    /* probably -1 for not available */
     }
-    if (rtot < 0) 
-	rtot = rcur = 0; /* if only one useful, use it */ 
-    if (ltot < 0) 
+    if (rtot < 0)
+	rtot = rcur = 0; /* if only one useful, use it */
+    if (ltot < 0)
 	ltot = lcur = 0;
-    if (rtot+ltot < 1) 
+    if (rtot+ltot < 1)
     {   /* empty rset */
         *current = *total = 0;
         return;
     }
     r = 1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */
     *current = (double) (p->hits);
-    *total = *current/r ; 
+    *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,
@@ -512,3 +272,12 @@ static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
     rset_getterms(info->rset_r, terms, maxterms, curterm);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+