-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Heikki Levanto
- *
- * $Id: rsbetween.c,v 1.2 2002-04-12 14:51:34 heikki Exp $
- */
+/* $Id: rsbetween.c,v 1.7 2002-08-02 19:26:57 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
#include <stdlib.h>
RSET rset_l;
RSET rset_m;
RSET rset_r;
+ RSET rset_attr;
int term_index_s;
int (*cmp)(const void *p1, const void *p2);
- char *(*printer)(void *p1, char *buf);
+ char *(*printer)(const void *p1, char *buf);
struct rset_between_rfd *rfd_list;
};
RSFD rfd_l;
RSFD rfd_m;
RSFD rfd_r;
+ RSFD rfd_attr;
int more_l;
int more_m;
int more_r;
+ int more_attr;
int term_index_l;
int term_index_m;
int term_index_r;
void *buf_l;
void *buf_m;
void *buf_r;
+ void *buf_attr;
int level;
struct rset_between_rfd *next;
struct rset_between_info *info;
};
-static void *r_create_between (RSET ct, const struct rset_control *sel, void *parms)
+static void *r_create_between (RSET ct, const struct rset_control *sel,
+ void *parms)
{
rset_between_parms *between_parms = (rset_between_parms *) parms;
struct rset_between_info *info;
info->rset_l = between_parms->rset_l;
info->rset_m = between_parms->rset_m;
info->rset_r = between_parms->rset_r;
+ info->rset_attr = between_parms->rset_attr;
if (rset_is_volatile(info->rset_l) ||
rset_is_volatile(info->rset_m) ||
rset_is_volatile(info->rset_r))
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_m->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_m->rset_terms,
- info->rset_m->no_rset_terms * sizeof(*ct->rset_terms));
- memcpy (ct->rset_terms + info->rset_l->no_rset_terms +
- info->rset_m->no_rset_terms,
- info->rset_r->rset_terms,
- info->rset_r->no_rset_terms * sizeof(*ct->rset_terms));
+ if (info->rset_m)
+ {
+ ct->no_rset_terms =
+ info->rset_l->no_rset_terms +
+ info->rset_m->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_m->rset_terms,
+ info->rset_m->no_rset_terms * sizeof(*ct->rset_terms));
+ memcpy (ct->rset_terms + info->rset_l->no_rset_terms +
+ info->rset_m->no_rset_terms,
+ info->rset_r->rset_terms,
+ info->rset_r->no_rset_terms * sizeof(*ct->rset_terms));
+ }
+ else
+ {
+ 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;
}
rfd->buf_l = xmalloc (info->key_size);
rfd->buf_m = xmalloc (info->key_size);
rfd->buf_r = xmalloc (info->key_size);
+ rfd->buf_attr = xmalloc (info->key_size);
+
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);
+
rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l,
&rfd->term_index_l);
rfd->more_m = rset_read (info->rset_m, rfd->rfd_m, rfd->buf_m,
&rfd->term_index_m);
rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r,
&rfd->term_index_r);
+ if (info->rset_attr)
+ {
+ int dummy;
+ rfd->rfd_attr = rset_open (info->rset_attr, RSETF_READ);
+ rfd->more_attr = rset_read (info->rset_attr, rfd->rfd_attr,
+ rfd->buf_attr, &dummy);
+ }
rfd->level=0;
return rfd;
}
xfree ((*rfdp)->buf_l);
xfree ((*rfdp)->buf_m);
xfree ((*rfdp)->buf_r);
+ xfree ((*rfdp)->buf_attr);
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;
xfree (rfd);
return;
rset_delete (info->rset_l);
rset_delete (info->rset_m);
rset_delete (info->rset_r);
+ if (info->rset_attr)
+ rset_delete (info->rset_attr);
xfree (info);
}
p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l);
p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, &p->term_index_m);
p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r);
+ if (info->rset_attr)
+ {
+ int dummy;
+ rset_rewind (info->rset_attr, p->rfd_attr);
+ p->more_attr = rset_read (info->rset_attr, p->rfd_attr, p->buf_attr,
+ &dummy);
+ }
p->level=0;
}
return 0;
}
+static void logit( struct rset_between_info *info, char *prefix, void *l, void *m, void *r)
+{
+ char buf_l[32];
+ char buf_m[32];
+ char buf_r[32];
+ logf(LOG_DEBUG,"btw: %s l=%s m=%s r=%s",
+ prefix,
+ (*info->printer)(l, buf_l),
+ (*info->printer)(m, buf_m),
+ (*info->printer)(r, buf_r) );
+}
+
static int r_read_between (RSFD rfd, void *buf, int *term_index)
{
struct rset_between_rfd *p = (struct rset_between_rfd *) rfd;
struct rset_between_info *info = p->info;
int cmp_l;
int cmp_r;
+ int attr_match;
while (p->more_m)
{
+ logit( info, "start of loop", p->buf_l, p->buf_m, p->buf_r);
/* forward L until past m, count levels, note rec boundaries */
if (p->more_l)
cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
else
cmp_l=2; /* past this record */
+ logf(LOG_DEBUG, "cmp_l=%d", cmp_l);
+
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;
+ int dummy_term;
+ 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;
+ p->more_attr = rset_read (info->rset_attr, p->rfd_attr,
+ p->buf_attr, &dummy_term);
+ }
+ }
+ }
if (p->more_l)
{
p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
&p->term_index_l);
cmp_l= (*info->cmp)(p->buf_l, p->buf_m);
+ logit( info, "forwarded L", p->buf_l, p->buf_m, p->buf_r);
+ logf(LOG_DEBUG, " cmp_l=%d", cmp_l);
}
else
cmp_l=2;
} /* forward L */
-
+
+
/* forward R until past m, count levels */
if (p->more_r)
cmp_r= (*info->cmp)(p->buf_r, p->buf_m);
else
cmp_r=2;
+ logf(LOG_DEBUG, "cmp_r=%d", cmp_r);
while (cmp_r < 0) /* r before m */
{
/* -2, earlier record, doesn't matter */
p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
&p->term_index_r);
cmp_r= (*info->cmp)(p->buf_r, p->buf_m);
+ logit( info, "forwarded R", p->buf_l, p->buf_m, p->buf_r);
+ logf(LOG_DEBUG, " cmp_r=%d", cmp_r);
}
else
cmp_r=2;
if ( ( p->level <= 0 ) && ! p->more_l)
return 0; /* no more start tags, nothing more to find */
-
- if ( p->level > 0) /* within a tag pair (or deeper) */
+
+ if ( attr_match && p->level > 0) /* within a tag pair (or deeper) */
{
memcpy (buf, p->buf_m, info->key_size);
*term_index = p->term_index_m;
- return 1;
+ logit( info, "Returning a hit (m)", p->buf_l, p->buf_m, p->buf_r);
+ p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m,
+ &p->term_index_m);
+ return 1;
}
else
if ( ! p->more_l ) /* not in data, no more starts */
&p->term_index_m);
} /* while more_m */
+ logf(LOG_DEBUG,"Exiting, no more stuff in m");
return 0; /* no more data possible */
+
} /* r_read */
projects / idzebra-moved-to-github.git / blobdiff