X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbetween.c;h=63901cd45463f695295cb09dbd5dd51bdb687b7b;hp=475b208af30cf688e9720ad8f0b3814609730db4;hb=726c42c6ae793b79a5351d2fce805d220d21321e;hpb=8d47d759a2e957ada235ab83bf877f2eb0d2ab99

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 475b208..63901cd 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,4 +1,4 @@
-/* $Id: rsbetween.c,v 1.22 2004-08-26 11:11:59 heikki Exp $
+/* $Id: rsbetween.c,v 1.25 2004-09-09 10:08:06 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -36,7 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 
 #include <zebrautl.h>
-#include <rsbetween.h>
+#include <rset.h>
 
 #define RSBETWEEN_DEBUG 0 
 
@@ -44,9 +44,7 @@ static RSFD r_open_between (RSET ct, int flag);
 static void r_close_between (RSFD rfd);
 static void r_delete_between (RSET ct);
 static void r_rewind_between (RSFD rfd);
-static int r_forward_between(RSET ct, RSFD rfd, void *buf, 
-                     int (*cmpfunc)(const void *p1, const void *p2),
-                     const void *untilbuf);
+static int r_forward_between(RSFD rfd, void *buf, const void *untilbuf);
 static int r_read_between (RSFD rfd, void *buf);
 static int r_write_between (RSFD rfd, const void *buf);
 static void r_pos_between (RSFD rfd, double *current, double *total);
@@ -54,11 +52,11 @@ static void r_pos_between (RSFD rfd, double *current, double *total);
 static const struct rset_control control = 
 {
     "between",
+    r_delete_between,
     r_open_between,
     r_close_between,
-    r_delete_between,
     r_rewind_between,
-    r_forward_between, /* rset_default_forward, */
+    r_forward_between, 
     r_pos_between,
     r_read_between,
     r_write_between,
@@ -68,15 +66,10 @@ static const struct rset_control control =
 const struct rset_control *rset_kind_between = &control;
 
 struct rset_between_info {
-    int key_size;
-    RSET rset_l;
-    RSET rset_m;
-    RSET rset_r;
-    RSET rset_attr;
-    int (*cmp)(const void *p1, const void *p2);
-    char *(*printer)(const void *p1, char *buf);
-    struct rset_between_rfd *rfd_list;
-    struct rset_between_rfd *free_list;
+    RSET rset_l;  /* left arg, start tag */
+    RSET rset_m;  /* the thing itself */
+    RSET rset_r;  /* right arg, end tag */
+    RSET rset_attr; /* attributes , optional */
 };
 
 struct rset_between_rfd {
@@ -92,9 +85,7 @@ struct rset_between_rfd {
     void *buf_m;
     void *buf_r;
     void *buf_attr;
-    int level;
-    struct rset_between_rfd *next;
-    struct rset_between_info *info;
+    int level;  /* counting start/end tags */
     zint hits;
 };    
 
@@ -113,24 +104,17 @@ static void log2 (struct rset_between_rfd *p, char *msg, int cmp_l, int cmp_r)
 }
 #endif
 
-RSET rsbetween_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr,
-            char *(*printer)(const void *p1, char *buf) )
+RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol,
+            int scope,
+            RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
 {
-    RSET rnew=rset_create_base(&control, nmem);
-    struct rset_between_info *info;
-    info = (struct rset_between_info *) nmem_malloc(rnew->nmem,sizeof(*info));
-    info->key_size = key_size;
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
+    struct rset_between_info *info=
+        (struct rset_between_info *) nmem_malloc(rnew->nmem,sizeof(*info));
     info->rset_l = rset_l;
     info->rset_m = rset_m;
     info->rset_r = rset_r;
     info->rset_attr = rset_attr;
-    info->cmp = cmp;
-    info->printer = printer;
-    info->rfd_list = NULL;
-    info->free_list = NULL;
-    
     rnew->priv=info;
     return rnew;
 }
@@ -140,7 +124,6 @@ static void r_delete_between (RSET ct)
 {
     struct rset_between_info *info = (struct rset_between_info *) ct->priv;
 
-    assert (info->rfd_list == NULL);
     rset_delete (info->rset_l);
     rset_delete (info->rset_m);
     rset_delete (info->rset_r);
@@ -152,86 +135,74 @@ static void r_delete_between (RSET ct)
 static RSFD r_open_between (RSET ct, int flag)
 {
     struct rset_between_info *info = (struct rset_between_info *) ct->priv;
-    struct rset_between_rfd *rfd;
+    RSFD rfd;
+    struct rset_between_rfd *p;
 
     if (flag & RSETF_WRITE)
     {
         logf (LOG_FATAL, "between set type is read-only");
         return NULL;
     }
-    rfd=info->free_list;
-    if (rfd)  
-        info->free_list=rfd->next;
+    rfd=rfd_create_base(ct);
+    if (rfd->priv)  
+        p=(struct rset_between_rfd *)rfd->priv;
     else {
-        rfd = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*rfd)));
-        rfd->buf_l = nmem_malloc(ct->nmem, (info->key_size));
-        rfd->buf_m = nmem_malloc(ct->nmem, (info->key_size));
-        rfd->buf_r = nmem_malloc(ct->nmem, (info->key_size));
-        rfd->buf_attr = nmem_malloc(ct->nmem, (info->key_size));
+        p = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*p)));
+        rfd->priv=p;
+        p->buf_l = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
+        p->buf_m = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
+        p->buf_r = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
+        p->buf_attr = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
     }
-    rfd->next = info->rfd_list;
-    info->rfd_list = rfd;
-    rfd->info = info;
 
-    rfd->rfd_l = rset_open (info->rset_l, RSETF_READ);
-    rfd->rfd_m = rset_open (info->rset_m, RSETF_READ);
-    rfd->rfd_r = rset_open (info->rset_r, RSETF_READ);
+    p->rfd_l = rset_open (info->rset_l, RSETF_READ);
+    p->rfd_m = rset_open (info->rset_m, RSETF_READ);
+    p->rfd_r = rset_open (info->rset_r, RSETF_READ);
     
-    rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l);
-    rfd->more_m = rset_read (info->rset_m, rfd->rfd_m, rfd->buf_m);
-    rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r);
+    p->more_l = rset_read (p->rfd_l, p->buf_l);
+    p->more_m = rset_read (p->rfd_m, p->buf_m);
+    p->more_r = rset_read (p->rfd_r, p->buf_r);
     if (info->rset_attr)
     {
-        rfd->rfd_attr = rset_open (info->rset_attr, RSETF_READ);
-        rfd->more_attr = rset_read (info->rset_attr, rfd->rfd_attr,
-                                    rfd->buf_attr);
+        p->rfd_attr = rset_open (info->rset_attr, RSETF_READ);
+        p->more_attr = rset_read (p->rfd_attr, p->buf_attr);
     }
-    rfd->level=0;
-    rfd->hits=0;
+    p->level=0;
+    p->hits=0;
     return rfd;
 }
 
 static void r_close_between (RSFD rfd)
 {
-    struct rset_between_info *info = ((struct rset_between_rfd*)rfd)->info;
-    struct rset_between_rfd **rfdp;
-    
-    for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next)
-        if (*rfdp == rfd)
-        {
-            struct rset_between_rfd *rfd_tmp=*rfdp;
-            rset_close (info->rset_l, (*rfdp)->rfd_l);
-            rset_close (info->rset_m, (*rfdp)->rfd_m);
-            rset_close (info->rset_r, (*rfdp)->rfd_r);
-            if (info->rset_attr)
-                rset_close (info->rset_attr, (*rfdp)->rfd_attr);
-            *rfdp = (*rfdp)->next;
-            rfd_tmp->next=info->free_list;
-            info->free_list=rfd_tmp;
-            return;
-        }
-    logf (LOG_FATAL, "r_close_between but no rfd match!");
-    assert (0);
+    struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
+    struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
+
+    rset_close (p->rfd_l);
+    rset_close (p->rfd_m);
+    rset_close (p->rfd_r);
+    if (info->rset_attr)
+        rset_close (p->rfd_attr);
+    rfd_delete_base(rfd);
 }
 
 static void r_rewind_between (RSFD rfd)
 {
-    struct rset_between_info *info = ((struct rset_between_rfd*)rfd)->info;
-    struct rset_between_rfd *p = (struct rset_between_rfd *) rfd;
+    struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
+    struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
 
 #if RSBETWEEN_DEBUG
     logf (LOG_DEBUG, "rsbetween_rewind");
 #endif
-    rset_rewind (info->rset_l, p->rfd_l);
-    rset_rewind (info->rset_m, p->rfd_m);
-    rset_rewind (info->rset_r, p->rfd_r);
-    p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
-    p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m);
-    p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
+    rset_rewind (p->rfd_l);
+    rset_rewind (p->rfd_m);
+    rset_rewind (p->rfd_r);
+    p->more_l = rset_read (p->rfd_l, p->buf_l);
+    p->more_m = rset_read (p->rfd_m, p->buf_m);
+    p->more_r = rset_read (p->rfd_r, p->buf_r);
     if (info->rset_attr)
     {
-        rset_rewind (info->rset_attr, p->rfd_attr);
-        p->more_attr = rset_read (info->rset_attr, p->rfd_attr, p->buf_attr);
+        rset_rewind (p->rfd_attr);
+        p->more_attr = rset_read (p->rfd_attr, p->buf_attr);
     }
     p->level=0;
     p->hits=0;
@@ -239,12 +210,9 @@ static void r_rewind_between (RSFD rfd)
 
 
 
-static int r_forward_between(RSET ct, RSFD rfd, void *buf,
-                     int (*cmpfunc)(const void *p1, const void *p2),
-                     const void *untilbuf)
+static int r_forward_between(RSFD rfd, void *buf, const void *untilbuf)
 {
-    struct rset_between_info *info = ((struct rset_between_rfd*)rfd)->info;
-    struct rset_between_rfd *p = (struct rset_between_rfd *) rfd;
+    struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
     int rc;
 #if RSBETWEEN_DEBUG
     log2( p, "fwd: before forward", 0,0);
@@ -252,8 +220,7 @@ static int r_forward_between(RSET ct, RSFD rfd, void *buf,
     /* It is enough to forward the m pointer here, the read will */
     /* naturally forward the l, m, and attr pointers */
     if (p->more_m)
-        p->more_m=rset_forward(info->rset_m,p->rfd_m, p->buf_m,
-                        info->cmp,untilbuf);
+        p->more_m=rset_forward(p->rfd_m, p->buf_m,untilbuf);
 #if RSBETWEEN_DEBUG
     log2( p, "fwd: after forward M", 0,0);
 #endif
@@ -269,8 +236,9 @@ static int r_forward_between(RSET ct, RSFD rfd, void *buf,
 
 static int r_read_between (RSFD rfd, void *buf)
 {
-    struct rset_between_rfd *p = (struct rset_between_rfd *) rfd;
-    struct rset_between_info *info = p->info;
+    struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
+    struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
+    const struct key_control *kctrl=rfd->rset->keycontrol;
     int cmp_l=0;
     int cmp_r=0;
     int attr_match = 0;
@@ -283,11 +251,11 @@ static int r_read_between (RSFD rfd, void *buf)
 
         /* forward L until past m, count levels, note rec boundaries */
         if (p->more_l)
-            cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
+            cmp_l= (*kctrl->cmp)(p->buf_l, p->buf_m);
         else
         {
             p->level = 0;
-            cmp_l=2; /* past this record */
+            cmp_l=rfd->rset->scope; /* past this record */
         }
 #if RSBETWEEN_DEBUG
         log2( p, "after first L", cmp_l, cmp_r);
@@ -295,9 +263,9 @@ static int r_read_between (RSFD rfd, void *buf)
 
         while (cmp_l < 0)   /* l before m */
         {
-            if (cmp_l == -2)
+            if (cmp_l <= - rfd->rset->scope)  /* ==-2 */
                 p->level=0; /* earlier record */
-            if (cmp_l == -1)
+            if (cmp_l > - rfd->rset->scope)  /* == -1 */
             {
                 p->level++; /* relevant start tag */
 
@@ -309,7 +277,7 @@ static int r_read_between (RSFD rfd, void *buf)
                     attr_match = 0;
                     while (p->more_attr)
                     {
-                        cmp_attr = (*info->cmp)(p->buf_attr, p->buf_l);
+                        cmp_attr = (*kctrl->cmp)(p->buf_attr, p->buf_l);
                         if (cmp_attr == 0)
                         {
                             attr_match = 1;
@@ -317,19 +285,18 @@ static int r_read_between (RSFD rfd, void *buf)
                         }
                         else if (cmp_attr > 0)
                             break;
-                        else if (cmp_attr==-1) 
-                            p->more_attr = rset_read (info->rset_attr, 
-                                                  p->rfd_attr, p->buf_attr);
+                        else if (cmp_attr > - rfd->rset->scope)  /* == -1 */
+                            p->more_attr = rset_read (p->rfd_attr, p->buf_attr);
                             /* if we had a forward that went all the way to
                              * the seqno, we could use that. But fwd only goes
                              * to the sysno */
-                        else if (cmp_attr==-2) 
+                        else if (cmp_attr <= - rfd->rset->scope) /* ==-2 */
                         {
-                            p->more_attr = rset_forward(
-                                      info->rset_attr, p->rfd_attr,
-                                      p->buf_attr, info->cmp, p->buf_l);
+                            p->more_attr = rset_forward( p->rfd_attr,
+                                             p->buf_attr, p->buf_l);
 #if RSBETWEEN_DEBUG
-                            logf(LOG_DEBUG, "btw: after frowarding attr m=%d",p->more_attr);
+                            logf(LOG_DEBUG, "btw: after frowarding attr m=%d",
+                                      p->more_attr);
 #endif
                         }
                     } /* while more_attr */
@@ -337,33 +304,32 @@ static int r_read_between (RSFD rfd, void *buf)
             }
 #define NEWCODE 1 
 #if NEWCODE                
-            if (cmp_l==-2)
+            if (cmp_l <= - rfd->rset->scope )/* ==-2 */
             {
                 if (p->more_l) 
                 {
-                    p->more_l=rset_forward( info->rset_l, p->rfd_l,
-                                      p->buf_l, info->cmp, p->buf_m);
+                    p->more_l=rset_forward(p->rfd_l, p->buf_l, p->buf_m);
                     if (p->more_l)
-                        cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
+                        cmp_l= (*kctrl->cmp)(p->buf_l, p->buf_m);
                     else
-                        cmp_l=2;
+                        cmp_l=rfd->rset->scope;  /*2*/
 #if RSBETWEEN_DEBUG
                     log2( p, "after forwarding L", cmp_l, cmp_r);
 #endif
                 }
             } else
             {
-                p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
+                p->more_l = rset_read (p->rfd_l, p->buf_l);
             }
 #else
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
+            p->more_l = rset_read (p->rfd_l, p->buf_l);
 #endif
             if (p->more_l)
             {
-                cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
+                cmp_l= (*kctrl->cmp)(p->buf_l, p->buf_m);
             }
             else
-                cmp_l=2; 
+                cmp_l=rfd->rset->scope;   /*2*/
 #if RSBETWEEN_DEBUG
             log2( p, "end of L loop", cmp_l, cmp_r);
 #endif
@@ -375,38 +341,37 @@ static int r_read_between (RSFD rfd, void *buf)
         log2( p, "Before moving R", cmp_l, cmp_r);
 #endif
         if (p->more_r)
-            cmp_r= (*info->cmp)(p->buf_r, p->buf_m);
+            cmp_r= (*kctrl->cmp)(p->buf_r, p->buf_m);
         else
-            cmp_r=2; 
+            cmp_r=rfd->rset->scope;  /*2*/
 #if RSBETWEEN_DEBUG
         log2( p, "after first R", cmp_l, cmp_r);
 #endif
         while (cmp_r < 0)   /* r before m */
         {
              /* -2, earlier record, don't count level */
-            if (cmp_r == -1)
+            if (cmp_r > -rfd->rset->scope) /* == -1 */
                 p->level--; /* relevant end tag */
             if (p->more_r)
             {
 #if NEWCODE                
-                if (cmp_r==-2)
+                if (cmp_r <= - rfd->rset->scope) /* == -2 */
                 {
-                    p->more_r=rset_forward( info->rset_r, p->rfd_r,
-                                      p->buf_r, info->cmp, p->buf_m);
+                    p->more_r=rset_forward(p->rfd_r, p->buf_r, p->buf_m);
                 } else
                 {
-                    p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
+                    p->more_r = rset_read (p->rfd_r, p->buf_r);
                 }
                 if (p->more_r)
-                    cmp_r= (*info->cmp)(p->buf_r, p->buf_m);
+                    cmp_r= (*kctrl->cmp)(p->buf_r, p->buf_m);
 
 #else
-                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r);
-                cmp_r= (*info->cmp)(p->buf_r, p->buf_m);
+                p->more_r = rset_read (p->rfd_r, p->buf_r);
+                cmp_r= (*kctrl->cmp)(p->buf_r, p->buf_m);
 #endif
             }
             else
-                cmp_r=2; 
+                cmp_r=rfd->rset->scope;  /*2*/
 #if RSBETWEEN_DEBUG
         log2( p, "End of R loop", cmp_l, cmp_r);
 #endif
@@ -417,12 +382,12 @@ static int r_read_between (RSFD rfd, void *buf)
         
         if ( attr_match && p->level > 0)  /* within a tag pair (or deeper) */
         {
-            memcpy (buf, p->buf_m, info->key_size);
+            memcpy (buf, p->buf_m, kctrl->key_size);
 #if RSBETWEEN_DEBUG
             log2( p, "Returning a hit (and forwarding m)", cmp_l, cmp_r);
 #endif
-            p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m);
-            if (cmp_l == 2)
+            p->more_m = rset_read (p->rfd_m, p->buf_m);
+            if (cmp_l >= rfd->rset->scope)  /* == 2 */
                 p->level = 0;
             p->hits++;
             return 1;
@@ -435,19 +400,18 @@ static int r_read_between (RSFD rfd, void *buf)
             return 0;  /* ergo, nothing can be found. stop scanning */
         }
 #if NEWCODE                
-        if (cmp_l == 2)
+        if (cmp_l >= rfd->rset->scope) /* == 2 */
         {
             p->level = 0;
-            p->more_m=rset_forward( info->rset_m, p->rfd_m,
-                              p->buf_m, info->cmp, p->buf_l);
+            p->more_m=rset_forward(p->rfd_m, p->buf_m,  p->buf_l);
         } else
         {
-            p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m);
+            p->more_m = rset_read (p->rfd_m, p->buf_m);
         }
 #else
-        if (cmp_l == 2)
+        if (cmp_l >= rfd->rset->scope )  /* == 2 */
             p->level = 0;
-        p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m);
+        p->more_m = rset_read (p->rfd_m, p->buf_m);
 #endif
 #if RSBETWEEN_DEBUG
         log2( p, "End of M loop", cmp_l, cmp_r);
@@ -472,16 +436,15 @@ static int r_write_between (RSFD rfd, const void *buf)
 
 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;
+    struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
     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);
+    rset_pos(p->rfd_l,  &lcur, &ltot);
+    rset_pos(p->rfd_m,  &mcur, &mtot);
+    rset_pos(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 */