X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=f33400f33446d7447213c57f030911b12be94178;hb=cb007c6145b0dbb3fcbe9826f081650becf9a05c;hp=ec3831dd43f823a6709e8854a19cf8a1e7a79c78;hpb=1bb217ab477284fd7fee47f19a6e8a780fa2bb50;p=idzebra-moved-to-github.git

diff --git a/rset/rsbool.c b/rset/rsbool.c
index ec3831d..f33400f 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.36 2004-08-06 12:28:23 adam Exp $
+/* $Id: rsbool.c,v 1.39 2004-08-23 12:38:53 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -38,13 +38,13 @@ 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(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
                      int (*cmpfunc)(const void *p1, const void *p2),
                      const void *untilbuf);
 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);
+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_write (RSFD rfd, const void *buf);
 
 static const struct rset_control control_and = 
@@ -55,8 +55,8 @@ static const struct rset_control control_and =
     r_close,
     r_delete,
     r_rewind,
-    r_forward, /* rset_default_forward, */
-    r_pos,     /* rset_default_pos */
+    r_forward, 
+    r_pos,    
     r_read_and,
     r_write,
 };
@@ -98,7 +98,6 @@ struct rset_bool_info {
     int key_size;
     RSET rset_l;
     RSET rset_r;
-    int term_index_s;
     int (*cmp)(const void *p1, const void *p2);
     void (*log_item)(int logmask, const void *p, const char *txt);
     struct rset_bool_rfd *rfd_list;
@@ -110,8 +109,6 @@ struct rset_bool_rfd {
     RSFD rfd_r;
     int  more_l;
     int  more_r;
-    int term_index_l;
-    int term_index_r;
     void *buf_l;
     void *buf_r;
     int tail;
@@ -128,23 +125,10 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
     info->key_size = bool_parms->key_size;
     info->rset_l = bool_parms->rset_l;
     info->rset_r = bool_parms->rset_r;
-    if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r))
-        ct->flags |= RSET_FLAG_VOLATILE;
     info->cmp = bool_parms->cmp;
     info->log_item = bool_parms->log_item;
     info->rfd_list = NULL;
     
-    info->term_index_s = info->rset_l->no_rset_terms;
-    ct->no_rset_terms =
-	info->rset_l->no_rset_terms + info->rset_r->no_rset_terms;
-    ct->rset_terms = (RSET_TERM *)
-	xmalloc (sizeof (*ct->rset_terms) * ct->no_rset_terms);
-
-    memcpy (ct->rset_terms, info->rset_l->rset_terms,
-	    info->rset_l->no_rset_terms * sizeof(*ct->rset_terms));
-    memcpy (ct->rset_terms + info->rset_l->no_rset_terms,
-	    info->rset_r->rset_terms,
-	    info->rset_r->no_rset_terms * sizeof(*ct->rset_terms));
     return info;
 }
 
@@ -155,8 +139,8 @@ static RSFD r_open (RSET ct, int flag)
 
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "bool set type is read-only");
-	return NULL;
+        logf (LOG_FATAL, "bool set type is read-only");
+        return NULL;
     }
     rfd = (struct rset_bool_rfd *) xmalloc (sizeof(*rfd));
     logf(LOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd);
@@ -169,10 +153,8 @@ static RSFD r_open (RSET ct, int flag)
     rfd->buf_r = xmalloc (info->key_size);
     rfd->rfd_l = rset_open (info->rset_l, RSETF_READ);
     rfd->rfd_r = rset_open (info->rset_r, RSETF_READ);
-    rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l,
-			     &rfd->term_index_l);
-    rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r,
-			     &rfd->term_index_r);
+    rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l);
+    rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r);
     rfd->tail = 0;
     return rfd;
 }
@@ -202,7 +184,6 @@ static void r_delete (RSET ct)
     struct rset_bool_info *info = (struct rset_bool_info *) ct->buf;
 
     assert (info->rfd_list == NULL);
-    xfree (ct->rset_terms);
     rset_delete (info->rset_l);
     rset_delete (info->rset_r);
     xfree (info);
@@ -216,12 +197,12 @@ static void r_rewind (RSFD rfd)
     logf (LOG_DEBUG, "rsbool_rewind");
     rset_rewind (info->rset_l, p->rfd_l);
     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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
+    p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
     p->hits=0;
 }
 
-static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward (RSET ct, RSFD rfd, void *buf,
                      int (*cmpfunc)(const void *p1, const void *p2),
                      const void *untilbuf)
 {
@@ -235,21 +216,21 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 #endif
     if ( p->more_l && ((cmpfunc)(untilbuf,p->buf_l)==2) )
         p->more_l = rset_forward(info->rset_l, p->rfd_l, p->buf_l,
-                        &p->term_index_l, info->cmp, untilbuf);
+                        info->cmp, untilbuf);
 #if RSET_DEBUG
     logf (LOG_DEBUG, "rsbool_forward (R) [%p] '%s' (ct=%p rfd=%p m=%d,%d)",
                       rfd, ct->control->desc, ct, rfd, p->more_l, p->more_r);
 #endif
     if ( p->more_r && ((cmpfunc)(untilbuf,p->buf_r)==2))
         p->more_r = rset_forward(info->rset_r, p->rfd_r, p->buf_r,
-                        &p->term_index_r, info->cmp, untilbuf);
+                        info->cmp, untilbuf);
 #if RSET_DEBUG
     logf (LOG_DEBUG, "rsbool_forward [%p] calling read, m=%d,%d t=%d", 
                        rfd, p->more_l, p->more_r, p->tail);
 #endif
     
     p->tail=0; 
-    rc = rset_read(ct,rfd,buf,term_index); 
+    rc = rset_read(ct,rfd,buf); 
 #if RSET_DEBUG
     logf (LOG_DEBUG, "rsbool_forward returning [%p] %d m=%d,%d", 
                        rfd, rc, p->more_l, p->more_r);
@@ -273,7 +254,7 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
           3,1
 */
 
-static int r_read_and (RSFD rfd, void *buf, int *term_index)
+static int r_read_and (RSFD rfd, void *buf)
 {
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
     struct rset_bool_info *info = p->info;
@@ -297,23 +278,19 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
         if (!cmp)
         {
             memcpy (buf, p->buf_l, info->key_size);
-	        *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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
             p->tail = 1;
         }
         else if (cmp == 1)
         {
             memcpy (buf, p->buf_r, info->key_size);
-	        *term_index = p->term_index_r + info->term_index_s;
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
             p->tail = 1;
 #if RSET_DEBUG
             logf (LOG_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);
-	    (*info->log_item)(LOG_DEBUG, buf, "");
+            (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -321,14 +298,12 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
         else if (cmp == -1)
         {
             memcpy (buf, p->buf_l, info->key_size);
-	        *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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
             p->tail = 1;
 #if RSET_DEBUG
             logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
                     rfd, p->more_l, p->more_r, cmp);
-	    (*info->log_item)(LOG_DEBUG, buf, "");
+            (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
             p->hits++;
             return 1;
@@ -338,10 +313,8 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
 #define OLDCODE 0
 #if OLDCODE
             memcpy (buf, p->buf_r, info->key_size);
-            *term_index = p->term_index_r + info->term_index_s;
             
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-                                   &p->term_index_r);
+            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
             if (p->tail)
             {
                 if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1)
@@ -349,7 +322,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
 #if RSET_DEBUG
                 logf (LOG_DEBUG, "r_read_and returning C m=%d/%d c=%d",
                         p->more_l, p->more_r, cmp);
-		(*info->log_item)(LOG_DEBUG, buf, "");
+                (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
                 p->hits++;
                 return 1;
@@ -359,30 +332,26 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
             if (p->tail)
             {
                 memcpy (buf, p->buf_r, info->key_size);
-                *term_index = p->term_index_r + info->term_index_s;
-                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-                                   &p->term_index_r);
+                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
                 if (!p->more_r || (*info->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",
                         rfd, p->more_l, p->more_r, cmp);
-		(*info->log_item)(LOG_DEBUG, buf, "");
+                (*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",
                         rfd, p->more_l, p->more_r, cmp);
 #endif
                 if (p->more_r && p->more_l)
-                    p->more_r = rset_forward( 
-                                    info->rset_r, p->rfd_r, 
-                                    p->buf_r, &p->term_index_r, 
-                                    (info->cmp), p->buf_l);
+                    p->more_r = rset_forward( info->rset_r, p->rfd_r, 
+                                    p->buf_r, (info->cmp), p->buf_l);
                 else 
                     return 0; /* no point in reading further */
             }
@@ -392,9 +361,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
         {
 #if OLDCODE
              memcpy (buf, p->buf_l, info->key_size);
-             *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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
              if (p->tail)
              {
                  if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1)
@@ -402,7 +369,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
 #if RSET_DEBUG
                  logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
                         rfd, p->more_l, p->more_r, cmp);
-		 (*info->log_item)(LOG_DEBUG, buf, "");
+                 (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
                  p->hits++;
                  return 1;
@@ -411,15 +378,13 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
             if (p->tail)
             {
                 memcpy (buf, p->buf_l, info->key_size);
-	            *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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
                 if (!p->more_l || (*info->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",
                         rfd, p->more_l, p->more_r, cmp);
-		(*info->log_item)(LOG_DEBUG, buf, "");
+                (*info->log_item)(LOG_DEBUG, buf, "");
 #endif
                 p->hits++;
                 return 1;
@@ -432,10 +397,8 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
 #endif
                 if (p->more_r && p->more_l)
                     p->more_l = rset_forward( 
-                    /* p->more_l = rset_default_forward( */
                                     info->rset_l, p->rfd_l, 
-                                    p->buf_l, &p->term_index_l, 
-                                    (info->cmp), p->buf_r);
+                                    p->buf_l, (info->cmp), p->buf_r);
                 else 
                     return 0; /* no point in reading further */
             }
@@ -448,7 +411,7 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
     return 0;
 }
 
-static int r_read_or (RSFD rfd, void *buf, int *term_index)
+static int r_read_or (RSFD rfd, void *buf)
 {
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
     struct rset_bool_info *info = p->info;
@@ -466,11 +429,8 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
         if (!cmp)
         {
             memcpy (buf, p->buf_l, info->key_size);
-	        *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->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
+            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
 #if RSET_DEBUG
             logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
@@ -482,9 +442,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
         else if (cmp > 0)
         {
             memcpy (buf, p->buf_r, info->key_size);
-	        *term_index = p->term_index_r + info->term_index_s;
-            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				   &p->term_index_r);
+            p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
 #if RSET_DEBUG
             logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
@@ -496,9 +454,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
         else
         {
             memcpy (buf, p->buf_l, info->key_size);
-	        *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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
 #if RSET_DEBUG
             logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
                     p->more_l, p->more_r, cmp);
@@ -511,7 +467,7 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
     return 0;
 }
 
-static int r_read_not (RSFD rfd, void *buf, int *term_index)
+static int r_read_not (RSFD rfd, void *buf)
 {
     struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
     struct rset_bool_info *info = p->info;
@@ -529,34 +485,29 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index)
         if (cmp < -1)
         {
             memcpy (buf, p->buf_l, info->key_size);
-	        *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->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
             p->hits++;
             return 1;
         }
         else if (cmp > 1)
         {
-	        p->more_r = rset_forward( 
-	            info->rset_r, p->rfd_r, 
-	            p->buf_r, &p->term_index_r, 
-	            (info->cmp), p->buf_l);
+                p->more_r = rset_forward( 
+                    info->rset_r, p->rfd_r, 
+                    p->buf_r, (info->cmp), p->buf_l);
         }
         else
         {
             memcpy (buf, p->buf_l, info->key_size);
             do
             { 
-                p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-				       &p->term_index_l);
+                p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
                 if (!p->more_l)
                     break;
                 cmp = (*info->cmp)(p->buf_l, buf);
             } while (cmp >= -1 && cmp <= 1);
             do
             {
-                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
-				       &p->term_index_r);
+                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
                 if (!p->more_r)
                     break;
                 cmp = (*info->cmp)(p->buf_r, buf);