X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=736bf188d2cb0c0f148a0afafb500903770ad5ed;hb=375478a4799d7a1aefd08452f73f3d4f8d43438f;hp=ec03558bf5c9a9fa155d60ada4fbf29ed06d9c76;hpb=32b696776940a403bb314ca72bb355a48ae97c21;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index ec03558..736bf18 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.28 2004-06-02 12:31:23 adam Exp $
+/* $Id: rsbool.c,v 1.37 2004-08-06 14:09:02 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -25,8 +25,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <assert.h>
 
-#include <rsbool.h>
 #include <zebrautl.h>
+#include <rset.h>
+#include <rsbool.h>
 
 #ifndef RSET_DEBUG
 #define RSET_DEBUG 0
@@ -40,7 +41,7 @@ static void r_rewind (RSFD rfd);
 static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
                      int (*cmpfunc)(const void *p1, const void *p2),
                      const void *untilbuf);
-static int r_count (RSET ct);
+static void r_pos (RSFD rfd, double *current, double *total); 
 static int r_read_and (RSFD rfd, void *buf, int *term_index);
 static int r_read_or (RSFD rfd, void *buf, int *term_index);
 static int r_read_not (RSFD rfd, void *buf, int *term_index);
@@ -54,8 +55,8 @@ static const struct rset_control control_and =
     r_close,
     r_delete,
     r_rewind,
-    r_forward, /* rset_default_forward, */
-    r_count,
+    r_forward, 
+    r_pos,    
     r_read_and,
     r_write,
 };
@@ -68,12 +69,8 @@ static const struct rset_control control_or =
     r_close,
     r_delete,
     r_rewind,
-#if 1
     r_forward, 
-#else
-    rset_default_forward,
-#endif
-    r_count,
+    r_pos,
     r_read_or,
     r_write,
 };
@@ -87,7 +84,7 @@ static const struct rset_control control_not =
     r_delete,
     r_rewind,
     r_forward, 
-    r_count,
+    r_pos,
     r_read_not,
     r_write,
 };
@@ -108,6 +105,7 @@ struct rset_bool_info {
 };
 
 struct rset_bool_rfd {
+    zint hits;
     RSFD rfd_l;
     RSFD rfd_r;
     int  more_l;
@@ -165,6 +163,7 @@ static RSFD r_open (RSET ct, int flag)
     rfd->next = info->rfd_list;
     info->rfd_list = rfd;
     rfd->info = info;
+    rfd->hits=0;
 
     rfd->buf_l = xmalloc (info->key_size);
     rfd->buf_r = xmalloc (info->key_size);
@@ -219,6 +218,7 @@ static void r_rewind (RSFD rfd)
     rset_rewind (info->rset_r, p->rfd_r);
     p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l);
     p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r);
+    p->hits=0;
 }
 
 static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
@@ -227,7 +227,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 {
     struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
-    int cmp=0;
     int rc;
 
 #if RSET_DEBUG
@@ -256,37 +255,6 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
                        rfd, rc, p->more_l, p->more_r);
 #endif
     return rc;
-
-    if (p->more_l && p->more_r)
-           cmp = (*info->cmp)(p->buf_l, p->buf_r);
-       else if (p->more_l)
-           cmp = -2;
-       else
-           cmp = 2;
-    if ( (cmp<0) && (p->more_l) )
-    {
-        memcpy (buf, p->buf_l, info->key_size);
-	    *term_index = p->term_index_l;
-#if RSET_DEBUG
-        logf (LOG_DEBUG, "rsbool_forward returning L (cmp=%d)",cmp);
-#endif
-        return 1;
-    } else if ( (cmp>0) && (p->more_r) )
-    {
-        memcpy (buf, p->buf_r, info->key_size);
-	    *term_index = p->term_index_r + info->term_index_s;
-#if RSET_DEBUG
-        logf (LOG_DEBUG, "rsbool_forward returning R (cmp=%d)",cmp);
-#endif
-        return 1;
-    }
-    /* return ( p->more_l || p->more_r); */
-    return 0;
-}
-
-static int r_count (RSET ct)
-{
-    return 0;
 }
 
 
@@ -347,6 +315,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
             key_logdump(LOG_DEBUG,buf);
 	    (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+            p->hits++;
             return 1;
         }
         else if (cmp == -1)
@@ -361,6 +330,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
                     rfd, p->more_l, p->more_r, cmp);
 	    (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+            p->hits++;
             return 1;
         }
         else if (cmp > 1)  /* cmp == 2 */
@@ -381,6 +351,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
                         p->more_l, p->more_r, cmp);
 		(*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+                p->hits++;
                 return 1;
             }
 #else
@@ -398,8 +369,10 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
                         rfd, p->more_l, p->more_r, cmp);
 		(*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+                p->hits++;
                 return 1;
-            } else
+            }
+	    else
             {
 #if RSET_DEBUG
                 logf (LOG_DEBUG, "r_read_and [%p] about to forward R m=%d/%d c=%d",
@@ -431,6 +404,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
                         rfd, p->more_l, p->more_r, cmp);
 		 (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+                 p->hits++;
                  return 1;
              }
 #else
@@ -447,6 +421,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
                         rfd, p->more_l, p->more_r, cmp);
 		(*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+                p->hits++;
                 return 1;
             }
             else
@@ -501,6 +476,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
                     p->more_l, p->more_r, cmp);
             (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+            p->hits++;
             return 1;
         }
         else if (cmp > 0)
@@ -514,6 +490,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
                     p->more_l, p->more_r, cmp);
             (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+            p->hits++;
             return 1;
         }
         else
@@ -527,6 +504,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
                     p->more_l, p->more_r, cmp);
             (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
+            p->hits++;
             return 1;
         }
     }
@@ -554,18 +532,16 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index)
 	        *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
 				   &p->term_index_l);
+            p->hits++;
             return 1;
         }
         else if (cmp > 1)
-#if 0
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
-#else
-            p->more_r = rset_forward( 
-                            info->rset_r, p->rfd_r, 
-                            p->buf_r, &p->term_index_r, 
-                            (info->cmp), p->buf_l);
-#endif
+        {
+	        p->more_r = rset_forward( 
+	            info->rset_r, p->rfd_r, 
+	            p->buf_r, &p->term_index_r, 
+	            (info->cmp), p->buf_l);
+        }
         else
         {
             memcpy (buf, p->buf_l, info->key_size);
@@ -597,3 +573,33 @@ static int r_write (RSFD rfd, const void *buf)
     return -1;
 }
 
+static void r_pos (RSFD rfd, double *current, double *total)
+{
+    struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
+    struct rset_bool_info *info = p->info;
+    double lcur,ltot;
+    double rcur,rtot;
+    double r;
+    ltot=-1; rtot=-1;
+    rset_pos(info->rset_l, p->rfd_l,  &lcur, &ltot);
+    rset_pos(info->rset_r, p->rfd_r,  &rcur, &rtot);
+    if ( (rtot<0) && (ltot<0)) { /*no position */
+        *current=rcur;  /* return same as you got */
+        *total=rtot;    /* probably -1 for not available */
+    }
+    if ( rtot<0) { rtot=0; rcur=0;} /* if only one useful, use it */
+    if ( ltot<0) { ltot=0; lcur=0;}
+    if ( rtot+ltot < 1 ) { /* empty rset */
+        *current=0;
+        *total=0;
+        return;
+    }
+    r=1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */
+    *current=(double) (p->hits);
+    *total=*current/r ; 
+#if RSET_DEBUG
+    yaz_log(LOG_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
+}