projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problem with generic proximity handling.
[idzebra-moved-to-github.git]
/
rset
/
rsprox.c
diff --git
a/rset/rsprox.c
b/rset/rsprox.c
index
acf8c33
..
896854e
100644
(file)
--- a/
rset/rsprox.c
+++ b/
rset/rsprox.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* 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
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
@@
-221,11
+221,14
@@
static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
seqno[n++] = (*kctrl->getseq)(p->buf[0]);
while ((p->more[0] = rset_read (p->rfd[0],
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]);
if (n < 500)
seqno[n++] = (*kctrl->getseq)(p->buf[0]);
-
+ }
for (i = 0; i<n; i++)
{
zint diff = (*kctrl->getseq)(p->buf[1]) - seqno[i];
for (i = 0; i<n; i++)
{
zint diff = (*kctrl->getseq)(p->buf[1]) - seqno[i];
@@
-333,6
+336,7
@@
static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab