X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbetween.c;h=86ca01834e8e1241ec99efc17a4852a4ee2d3887;hb=6ec32a146d639c16e9929435fdbfd8d915e918b3;hp=93ab3e758c90f95197207c55a0dc0093219a9baa;hpb=56131846f59919027a4d3c59efb485afb6efb0de;p=idzebra-moved-to-github.git diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 93ab3e7..86ca018 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $Id: rsbetween.c,v 1.24 2004-09-01 15:01:32 heikki Exp $ +/* $Id: rsbetween.c,v 1.26 2004-09-30 09:53:04 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -43,7 +43,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 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(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); @@ -55,7 +54,6 @@ static const struct rset_control control = r_delete_between, r_open_between, r_close_between, - r_rewind_between, r_forward_between, r_pos_between, r_read_between, @@ -105,9 +103,10 @@ static void log2 (struct rset_between_rfd *p, char *msg, int cmp_l, int cmp_r) #endif 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, kcontrol); + 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; @@ -184,29 +183,6 @@ static void r_close_between (RSFD rfd) rfd_delete_base(rfd); } -static void r_rewind_between (RSFD 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 (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 (p->rfd_attr); - p->more_attr = rset_read (p->rfd_attr, p->buf_attr); - } - p->level=0; - p->hits=0; -} - static int r_forward_between(RSFD rfd, void *buf, const void *untilbuf) @@ -254,7 +230,7 @@ static int r_read_between (RSFD rfd, void *buf) 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); @@ -262,9 +238,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 */ @@ -284,12 +260,12 @@ static int r_read_between (RSFD rfd, void *buf) } else if (cmp_attr > 0) break; - else if (cmp_attr==-1) + 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( p->rfd_attr, p->buf_attr, p->buf_l); @@ -303,7 +279,7 @@ 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) { @@ -311,7 +287,7 @@ static int r_read_between (RSFD rfd, void *buf) if (p->more_l) 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 @@ -328,7 +304,7 @@ static int r_read_between (RSFD rfd, void *buf) 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 @@ -342,19 +318,19 @@ static int r_read_between (RSFD rfd, void *buf) if (p->more_r) 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(p->rfd_r, p->buf_r, p->buf_m); } else @@ -370,7 +346,7 @@ static int r_read_between (RSFD rfd, void *buf) #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 @@ -386,7 +362,7 @@ static int r_read_between (RSFD rfd, void *buf) log2( p, "Returning a hit (and forwarding m)", cmp_l, cmp_r); #endif p->more_m = rset_read (p->rfd_m, p->buf_m); - if (cmp_l == 2) + if (cmp_l >= rfd->rset->scope) /* == 2 */ p->level = 0; p->hits++; return 1; @@ -399,7 +375,7 @@ 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(p->rfd_m, p->buf_m, p->buf_l); @@ -408,7 +384,7 @@ static int r_read_between (RSFD rfd, void *buf) 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 (p->rfd_m, p->buf_m); #endif