/* This file is part of the Zebra server.
- Copyright (C) 1995-2008 Index Data
+ Copyright (C) 1994-2009 Index Data
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
p->more[0] = rset_forward(p->rfd[0], p->buf[0],
&p->terms[0], untilbuf);
}
- if (info->ordered && info->relation == 3 && info->exclusion == 0
- && info->distance == 1)
+ if (info->ordered && info->relation <= 3 && info->exclusion == 0)
{
while (p->more[0])
{
p->more[0] = 0; /* saves us a goto out of while loop. */
break;
}
- cmp = (*kctrl->cmp) (p->buf[i], p->buf[i-1]);
- if (cmp >= rfd->rset->scope ) /* cmp>1 */
+ cmp = (*kctrl->cmp)(p->buf[i], p->buf[i-1]);
+ if (cmp >= rfd->rset->scope) /* not same record */
{
p->more[i-1] = rset_forward (p->rfd[i-1],
p->buf[i-1],
p->buf[i]);
break;
}
- else if ( cmp>0 ) /* cmp == 1*/
+ else if (cmp > 0) /* within record and ordered */
{
- if ((*kctrl->getseq)(p->buf[i-1]) +1 !=
- (*kctrl->getseq)(p->buf[i]))
- { /* FIXME - We need more flexible multilevel stuff */
- p->more[i-1] = rset_read ( p->rfd[i-1], p->buf[i-1],
- &p->terms[i-1]);
- break;
- }
+ zint diff = (*kctrl->getseq)(p->buf[i]) -
+ (*kctrl->getseq)(p->buf[i-1]);
+ if (info->relation == 3 && diff == info->distance)
+ continue;
+ else if (info->relation == 2 && diff <= info->distance)
+ continue;
+ else if (info->relation == 1 && diff < info->distance)
+ continue;
+
+ p->more[i-1] = rset_read(p->rfd[i-1], p->buf[i-1],
+ &p->terms[i-1]);
+ break;
}
- else
+ else /* within record - wrong order */
{
- p->more[i] = rset_forward (p->rfd[i],
- p->buf[i], &p->terms[i], p->buf[i-1]);
+ p->more[i] = rset_forward(p->rfd[i], p->buf[i],
+ &p->terms[i], p->buf[i-1]);
break;
}
}
if (i == ct->no_children)
{
- memcpy (buf, p->buf[0], kctrl->key_size);
+ i = ct->no_children-1;
+ memcpy(buf, p->buf[i], kctrl->key_size);
if (term)
- *term = p->terms[0];
- p->more[0] = rset_read (p->rfd[0], p->buf[0], &p->terms[0]);
+ *term = p->terms[i];
+ p->more[i] = rset_read(p->rfd[i], p->buf[i], &p->terms[i]);
p->hits++;
return 1;
}
seqno[n++] = (*kctrl->getseq)(p->buf[0]);
while ((p->more[0] = rset_read (p->rfd[0],
- p->buf[0], &p->terms[0])) >= -1 &&
- p->more[0] <= -1)
+ p->buf[0], &p->terms[0])))
+ {
+ cmp = (*kctrl->cmp)(p->buf[0], p->buf[1]);
+ if (cmp <= - rfd->rset->scope || cmp >= rfd->rset->scope)
+ break;
if (n < 500)
seqno[n++] = (*kctrl->getseq)(p->buf[0]);
-
- for (i = 0; i<n; i++)
+ }
+ /* set up return buffer.. (save buf[1]) */
+ memcpy(buf, p->buf[1], kctrl->key_size);
+ if (term)
+ *term = p->terms[1];
+ while (1)
{
- zint diff = (*kctrl->getseq)(p->buf[1]) - seqno[i];
- int excl = info->exclusion;
- if (!info->ordered && diff < 0)
- diff = -diff;
- switch (info->relation)
+ for (i = 0; i < n; i++)
{
- case 1: /* < */
- if (diff < info->distance && diff >= 0)
- excl = !excl;
- break;
- case 2: /* <= */
- if (diff <= info->distance && diff >= 0)
- excl = !excl;
- break;
- case 3: /* == */
- if (diff == info->distance && diff >= 0)
- excl = !excl;
- break;
- case 4: /* >= */
- if (diff >= info->distance && diff >= 0)
- excl = !excl;
- break;
- case 5: /* > */
- if (diff > info->distance && diff >= 0)
- excl = !excl;
+ zint diff = (*kctrl->getseq)(p->buf[1]) - seqno[i];
+ int excl = info->exclusion;
+ if (!info->ordered && diff < 0)
+ diff = -diff;
+ switch (info->relation)
+ {
+ case 1: /* < */
+ if (diff < info->distance && diff >= 0)
+ excl = !excl;
+ break;
+ case 2: /* <= */
+ if (diff <= info->distance && diff >= 0)
+ excl = !excl;
+ break;
+ case 3: /* == */
+ if (diff == info->distance && diff >= 0)
+ excl = !excl;
+ break;
+ case 4: /* >= */
+ if (diff >= info->distance && diff >= 0)
+ excl = !excl;
+ break;
+ case 5: /* > */
+ if (diff > info->distance && diff >= 0)
+ excl = !excl;
+ break;
+ case 6: /* != */
+ if (diff != info->distance && diff >= 0)
+ excl = !excl;
+ break;
+ }
+ if (excl)
+ {
+ p->more[1] = rset_read ( p->rfd[1], p->buf[1],
+ &p->terms[1]);
+ p->hits++;
+ return 1;
+ }
+ }
+ p->more[1] = rset_read(p->rfd[1], p->buf[1], &p->terms[1]);
+ if (!p->more[1])
break;
- case 6: /* != */
- if (diff != info->distance && diff >= 0)
- excl = !excl;
+ cmp = (*kctrl->cmp)(buf, p->buf[1]);
+ if (cmp <= - rfd->rset->scope || cmp >= rfd->rset->scope)
break;
- }
- if (excl)
- {
- memcpy (buf, p->buf[1], kctrl->key_size);
- if (term)
- *term = p->terms[1];
- p->more[1] = rset_read ( p->rfd[1], p->buf[1],
- &p->terms[1]);
- p->hits++;
- return 1;
- }
}
- p->more[1] = rset_read (p->rfd[1], p->buf[1], &p->terms[1]);
}
}
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab