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

diff --git a/rset/rsbool.c b/rset/rsbool.c
index fbbc03b..c573e10 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1994-2009 Index Data
+   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
@@ -17,6 +17,9 @@ 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>
@@ -33,19 +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 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_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,
@@ -67,7 +70,7 @@ struct rfd_private {
     TERMID term_l;
     TERMID term_r;
     int tail;
-};    
+};
 
 static RSET rsbool_create_base(const struct rset_control *ctrl,
 			       NMEM nmem,
@@ -148,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);
 }
 
 
@@ -193,7 +196,7 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term)
         }
         else if (cmp >= rfd->rset->scope)   /* cmp >1 */
         {
-            p->more_r = rset_forward( p->rfd_r, p->buf_r, 
+            p->more_r = rset_forward( p->rfd_r, p->buf_r,
                                       &p->term_r, p->buf_l);
         }
         else
@@ -202,7 +205,7 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term)
             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;
@@ -243,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,