X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fzserver.c;h=09b11fe30de8a784b56da7658c2e3f7748e95b49;hb=8ed385caafd1d9695a5a9c0783f0dbe2a53f3e80;hp=d183d2d6d3b86a3c3596c21e6ffa1a2af372a0d3;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index d183d2d..09b11fe 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $Id: zserver.c,v 1.127 2005-01-15 19:38:29 adam Exp $ +/* $Id: zserver.c,v 1.130 2005-03-08 14:02:12 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -20,8 +20,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include +#include +#include #include #ifdef WIN32 #include @@ -261,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; + zint zhits = 0; r->hits = 0; r->errcode = 0; @@ -277,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, - 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); @@ -381,7 +387,7 @@ int bend_delete (void *handle, bend_delete_rr *rr) { 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;