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
Added test cases for @and, @or, @not including bug #619.
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
565e652
..
1b67f8f
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-1,5
+1,5
@@
-/* $Id: zserver.c,v 1.145 2006-03-31 15:58:04 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: zserver.c,v 1.148 2006-06-07 10:50:09 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-251,15
+251,15
@@
static void search_terms(ZebraHandle zh, bend_search_rr *r)
se->subqueryExpression->u.term->termComment = 0;
se->subqueryInterpretation = 0;
se->subqueryRecommendation = 0;
se->subqueryExpression->u.term->termComment = 0;
se->subqueryInterpretation = 0;
se->subqueryRecommendation = 0;
- if (count > 2000000000)
- count = 2000000000;
- se->subqueryCount = odr_intdup(r->stream, (int) count);
+ if (count > 2147483646)
+ count = 2147483647;
+ se->subqueryCount = odr_intdup(r->stream, CAST_ZINT_TO_INT(count));
se->subqueryWeight = 0;
se->resultsByDB = 0;
}
}
se->subqueryWeight = 0;
se->resultsByDB = 0;
}
}
-int bend_search (void *handle, bend_search_rr *r)
+int bend_search(void *handle, bend_search_rr *r)
{
ZebraHandle zh = (ZebraHandle) handle;
zint zhits = 0;
{
ZebraHandle zh = (ZebraHandle) handle;
zint zhits = 0;
@@
-282,10
+282,9
@@
int bend_search (void *handle, bend_search_rr *r)
zebra_result(zh, &r->errcode, &r->errstring);
else
{
zebra_result(zh, &r->errcode, &r->errstring);
else
{
- if (zhits > 2147483646)
- r->hits = 2147483647;
- else
- r->hits = (int) zhits;
+ if (zhits > 2147483646)
+ zhits = 2147483647;
+ r->hits = CAST_ZINT_TO_INT(zhits);
search_terms (zh, r);
}
break;
search_terms (zh, r);
}
break;
@@
-369,7
+368,8
@@
static int bend_scan (void *handle, bend_scan_rr *r)
for (i = 0; i < r->num_entries; i++)
{
r->entries[i].term = entries[i].term;
for (i = 0; i < r->num_entries; i++)
{
r->entries[i].term = entries[i].term;
- r->entries[i].occurrences = entries[i].occurrences;
+ r->entries[i].occurrences =
+ CAST_ZINT_TO_INT(entries[i].occurrences);
}
}
else
}
}
else
@@
-841,3
+841,11
@@
int main (int argc, char **argv)
return statserv_main (argc, argv, bend_init, bend_close);
}
return statserv_main (argc, argv, bend_init, bend_close);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+