X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=ceeb56f684d417faad174494389fc89f1b12b774;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=89890876c857ce88605872b3153c9ffdc3a4851d;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 8989087..ceeb56f 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,5 +1,5 @@
-/* $Id: zserver.c,v 1.146 2006-05-10 08:13:23 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: zserver.c,v 1.149 2006-08-14 10:40:15 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <assert.h>
@@ -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;
-	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;
     }
 }
 
-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;
@@ -282,10 +282,9 @@ int bend_search (void *handle, bend_search_rr *r)
 	    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;
@@ -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;
-	    r->entries[i].occurrences = entries[i].occurrences;
+	    r->entries[i].occurrences =
+                CAST_ZINT_TO_INT(entries[i].occurrences);
 	}
     }
     else