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 typo WRT first Zebra version that supported ICU
[idzebra-moved-to-github.git]
/
rset
/
rset.c
diff --git
a/rset/rset.c
b/rset/rset.c
index
59d9dfd
..
3da4bd6
100644
(file)
--- a/
rset/rset.c
+++ b/
rset/rset.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 1994-2011 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
@@
-17,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <idzebra/util.h>
#include <stdio.h>
#include <string.h>
#include <idzebra/util.h>
@@
-27,6
+30,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
static int log_level = 0;
static int log_level_initialized = 0;
static int log_level = 0;
static int log_level_initialized = 0;
+
/**
\brief Common constuctor for RFDs
\param rs Result set handle.
/**
\brief Common constuctor for RFDs
\param rs Result set handle.
@@
-83,6
+87,7
@@
static void rset_close_int(RSET rs, RSFD rfd)
void rset_set_hits_limit(RSET rs, zint l)
{
void rset_set_hits_limit(RSET rs, zint l)
{
+ yaz_log(log_level, "rset_set_hits_limit %p l=" ZINT_FORMAT, rs, l);
rs->hits_limit = l;
}
rs->hits_limit = l;
}
@@
-405,7
+410,7
@@
int rset_default_forward(RSFD rfd, void *buf, TERMID *term,
while ((more = rset_read(rfd, buf, term)) > 0)
{
while ((more = rset_read(rfd, buf, term)) > 0)
{
- if ((rfd->rset->keycontrol->cmp)(untilbuf, buf) <= 1)
+ if ((rfd->rset->keycontrol->cmp)(untilbuf, buf) < rset->scope)
break;
}
if (log_level)
break;
}
if (log_level)