- while (cmp_l < 0) /* l before m */
- {
- if (cmp_l == -2)
- p->level=0; /* earlier record */
- if (cmp_l == -1)
- {
- p->level++; /* relevant start tag */
-
- if (!info->rset_attr)
- attr_match = 1;
- else
- {
- int cmp_attr;
- attr_match = 0;
- while (p->more_attr)
- {
- cmp_attr = (*info->cmp)(p->buf_attr, p->buf_l);
- if (cmp_attr == 0)
- {
- attr_match = 1;
- break;
- }
- 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);
- /* 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)
- {
- p->more_attr = rset_forward(
- info->rset_attr, p->rfd_attr,
- p->buf_attr, info->cmp, p->buf_l);
-#if RSBETWEEN_DEBUG
- logf(LOG_DEBUG, "btw: after frowarding attr m=%d",p->more_attr);
-#endif
- }
- } /* while more_attr */
- }
- }
-#define NEWCODE 1
-#if NEWCODE
- if (cmp_l==-2)
- {
- if (p->more_l)
- {
- p->more_l=rset_forward( info->rset_l, p->rfd_l,
- p->buf_l, info->cmp, p->buf_m);
- if (p->more_l)
- cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
- else
- cmp_l=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);
- }
-#else
- p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l);
-#endif
- if (p->more_l)
- {
- cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
- }
- else
- cmp_l=2;
-#if RSBETWEEN_DEBUG
- log2( p, "end of L loop", cmp_l, cmp_r);
-#endif
- } /* forward L */
+static int r_read(RSFD rfd, void *buf, TERMID *term)
+{
+ 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 rset_key_control *kctrl = rfd->rset->keycontrol;
+ int cmp;
+ TERMID dummyterm = 0;
+ yaz_log(log_level, "== read: term=%p",term);
+ if (!term)
+ term = &dummyterm;
+ while (rset_read(p->andrfd, buf, term))
+ {
+ yaz_log(log_level,"read loop term=%p d=%d ad=%d",
+ *term, p->depth, p->attrdepth);
+ if (p->hits<0)
+ {/* first time? */
+ memcpy(p->recbuf, buf, kctrl->key_size);
+ p->hits = 0;
+ cmp = rfd->rset->scope; /* force newrecord */
+ }
+ else {
+ cmp = (kctrl->cmp)(buf, p->recbuf);
+ yaz_log(log_level, "cmp=%d", cmp);
+ }