X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebrasrv.c;h=8707531fba0bb0ea0ae73ced15693ce5380db599;hp=8e9a3f06062e79948c6e7a99fdd553b730cac769;hb=4dc2670c4c6c898a392a9cf0e3068b36192a8ad7;hpb=477d69a25bcac01143c26d8842f9d741d638964b diff --git a/index/zebrasrv.c b/index/zebrasrv.c index 8e9a3f0..8707531 100644 --- a/index/zebrasrv.c +++ b/index/zebrasrv.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2010 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 @@ -253,9 +253,7 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r) se->subqueryExpression->u.term->termComment = 0; se->subqueryInterpretation = 0; se->subqueryRecommendation = 0; - if (count > 2147483646) - count = 2147483647; - se->subqueryCount = odr_intdup(r->stream, CAST_ZINT_TO_INT(count)); + se->subqueryCount = odr_intdup(r->stream, count); se->subqueryWeight = 0; se->resultsByDB = 0; } @@ -296,9 +294,7 @@ int bend_search(void *handle, bend_search_rr *r) zebra_result(zh, &r->errcode, &r->errstring); else { - if (zhits > 2147483646) - zhits = 2147483647; - r->hits = CAST_ZINT_TO_INT(zhits); + r->hits = zhits; search_terms(zh, r); } break; @@ -382,8 +378,7 @@ static int bend_scan(void *handle, bend_scan_rr *r) { r->entries[i].term = entries[i].term; r->entries[i].display_term = entries[i].display_term; - r->entries[i].occurrences = - CAST_ZINT_TO_INT(entries[i].occurrences); + r->entries[i].occurrences = entries[i].occurrences; } } else