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 a few casts from zint to double/int where appropriate.
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
ad2aa5a
..
09b11fe
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-1,6
+1,6
@@
-/* $Id: zserver.c,v 1.125 2004-12-13 20:51:30 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: zserver.c,v 1.130 2005-03-08 14:02:12 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,8
+20,9
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-#include <stdio.h>
#include <assert.h>
#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <fcntl.h>
#ifdef WIN32
#include <io.h>
#include <fcntl.h>
#ifdef WIN32
#include <io.h>
@@
-153,7
+154,8
@@
bend_initresult *bend_init (bend_initrequest *q)
charsets[i], right_name);
odr_set_charset (q->stream, right_name, "UTF-8");
if (selected)
charsets[i], right_name);
odr_set_charset (q->stream, right_name, "UTF-8");
if (selected)
- zebra_record_encoding (zh, right_name);
+ zebra_record_encoding(zh, right_name);
+ zebra_octet_term_encoding(zh, right_name);
q->charneg_response =
yaz_set_response_charneg (q->stream, charsets[i],
0, selected);
q->charneg_response =
yaz_set_response_charneg (q->stream, charsets[i],
0, selected);
@@
-260,6
+262,7
@@
static void search_terms (ZebraHandle zh, bend_search_rr *r)
int bend_search (void *handle, bend_search_rr *r)
{
ZebraHandle zh = (ZebraHandle) handle;
int bend_search (void *handle, bend_search_rr *r)
{
ZebraHandle zh = (ZebraHandle) handle;
+ zint zhits = 0;
r->hits = 0;
r->errcode = 0;
r->hits = 0;
r->errcode = 0;
@@
-276,7
+279,11
@@
int bend_search (void *handle, bend_search_rr *r)
{
case Z_Query_type_1: case Z_Query_type_101:
zebra_search_RPN (zh, r->stream, r->query->u.type_1,
{
case Z_Query_type_1: case Z_Query_type_101:
zebra_search_RPN (zh, r->stream, r->query->u.type_1,
- r->setname, &r->hits);
+ r->setname, &zhits);
+ if (zhits > 2147483646)
+ r->hits = 2147483647;
+ else
+ r->hits = (int) zhits;
zebra_result (zh, &r->errcode, &r->errstring);
if (!r->errcode)
search_terms (zh, r);
zebra_result (zh, &r->errcode, &r->errstring);
if (!r->errcode)
search_terms (zh, r);
@@
-380,7
+387,7
@@
int bend_delete (void *handle, bend_delete_rr *rr)
{
ZebraHandle zh = (ZebraHandle) handle;
{
ZebraHandle zh = (ZebraHandle) handle;
- rr->delete_status = zebra_deleleResultSet(zh, rr->function,
+ rr->delete_status = zebra_deleteResultSet(zh, rr->function,
rr->num_setnames, rr->setnames,
rr->statuses);
return 0;
rr->num_setnames, rr->setnames,
rr->statuses);
return 0;