X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbetween.c;h=bf6399271336acdecf8e4c2941b42d6939d48067;hb=b5eb8cd7ae4134d915ed8b4aec25ab90c8bd0dcb;hp=c7b49847c35950e7e455f9ec117297f69532ff4d;hpb=faf6c6be807bc7b0e99116b758f8076dee803f2d;p=idzebra-moved-to-github.git

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index c7b4984..bf63992 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,4 +1,4 @@
-/* $Id: rsbetween.c,v 1.13 2004-06-08 15:05:16 heikki Exp $
+/* $Id: rsbetween.c,v 1.17 2004-08-06 14:09:02 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -35,10 +35,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <assert.h>
 
-#include <rsbetween.h>
 #include <zebrautl.h>
+#include <rsbetween.h>
 
-#define RSBETWEEN_DEBUG 0
+#define RSBETWEEN_DEBUG 0 
 
 static void *r_create_between(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open_between (RSET ct, int flag);
@@ -48,9 +48,9 @@ static void r_rewind_between (RSFD rfd);
 static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index,
                      int (*cmpfunc)(const void *p1, const void *p2),
                      const void *untilbuf);
-static int r_count_between (RSET ct);
 static int r_read_between (RSFD rfd, void *buf, int *term_index);
 static int r_write_between (RSFD rfd, const void *buf);
+static void r_pos_between (RSFD rfd, double *current, double *total);
 
 static const struct rset_control control_between = 
 {
@@ -61,7 +61,7 @@ static const struct rset_control control_between =
     r_delete_between,
     r_rewind_between,
     r_forward_between, /* rset_default_forward, */
-    r_count_between,
+    r_pos_between,
     r_read_between,
     r_write_between,
 };
@@ -100,6 +100,7 @@ struct rset_between_rfd {
     int level;
     struct rset_between_rfd *next;
     struct rset_between_info *info;
+    zint hits;
 };    
 
 #if RSBETWEEN_DEBUG
@@ -211,6 +212,7 @@ static RSFD r_open_between (RSET ct, int flag)
                                     rfd->buf_attr, &dummy);
     }
     rfd->level=0;
+    rfd->hits=0;
     return rfd;
 }
 
@@ -276,6 +278,7 @@ static void r_rewind_between (RSFD rfd)
                                   &dummy);
     }
     p->level=0;
+    p->hits=0;
 }
 
 
@@ -305,10 +308,6 @@ static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index,
     return rc;
 }
 
-static int r_count_between (RSET ct)
-{
-    return 0;
-}
 
 
 
@@ -481,6 +480,7 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index)
                                    &p->term_index_m);
             if (cmp_l == 2)
                 p->level = 0;
+            p->hits++;
             return 1;
         }
         else if ( ! p->more_l )  /* not in data, no more starts */
@@ -529,3 +529,37 @@ static int r_write_between (RSFD rfd, const void *buf)
     return -1;
 }
 
+
+static void r_pos_between (RSFD rfd, double *current, double *total)
+{
+    struct rset_between_rfd *p = (struct rset_between_rfd *) rfd;
+    struct rset_between_info *info = p->info;
+    double lcur,ltot;
+    double mcur,mtot;
+    double rcur,rtot;
+    double r;
+    ltot=-1; rtot=-1;
+    rset_pos(info->rset_l, p->rfd_l,  &lcur, &ltot);
+    rset_pos(info->rset_m, p->rfd_m,  &mcur, &mtot);
+    rset_pos(info->rset_r, p->rfd_r,  &rcur, &rtot);
+    if ( (ltot<0) && (mtot<0) && (rtot<0) ) { /*no position */
+        *current=mcur;  /* return same as you got */
+        *total=mtot;    /* probably -1 for not available */
+    }
+    if ( ltot<0) { ltot=0; lcur=0;} /* if only one useful, use it */
+    if ( mtot<0) { mtot=0; mcur=0;}
+    if ( rtot<0) { rtot=0; rcur=0;}
+    if ( ltot+mtot+rtot < 1 ) { /* empty rset */
+        *current=0;
+        *total=0;
+        return;
+    }
+    r=1.0*(lcur+mcur+rcur)/(ltot+mtot+rtot); /* weighed average of l and r */
+    *current=p->hits;
+    *total=*current/r ; 
+#if RSBETWEEN_DEBUG
+    yaz_log(LOG_DEBUG,"betw_pos: (%s/%s) %0.1f/%0.1f= %0.4f ",
+                    info->rset_l->control->desc, info->rset_r->control->desc,
+                    *current, *total, r);
+#endif
+}