X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Frankstatic.c;h=531f0be42011604d9a5dcdfd920b0d5913be001c;hp=cc86ca10e150ed546a225f88cf566868a28382bb;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hpb=1369748dd7899789c97d94801048bf942e0cc6e6

diff --git a/index/rankstatic.c b/index/rankstatic.c
index cc86ca1..531f0be 100644
--- a/index/rankstatic.c
+++ b/index/rankstatic.c
@@ -1,8 +1,5 @@
-/* $Id: rankstatic.c,v 1.7 2006-05-19 23:20:24 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.
+   Copyright (C) 1994-2009 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
@@ -15,9 +12,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 <stdio.h>
@@ -91,7 +88,7 @@ static void *begin (struct zebra_register *reg,
 
 	for (; ol; ol = ol->next)
 	{
-	    int index_type = 0;
+	    const char *index_type = 0;
 	    const char *db = 0;
 	    const char *string_index = 0;
 	    int set = -1;
@@ -101,11 +98,11 @@ static void *begin (struct zebra_register *reg,
 				    ol->ord, &index_type, &db, &string_index);
 
 	    if (string_index)
-		yaz_log(log_level, " ord=%d index_type=%c db=%s str-index=%s",
-		    ol->ord, index_type, db, string_index);
+		yaz_log(log_level, " ord=%d index_type=%s db=%s str-index=%s",
+                        ol->ord, index_type, db, string_index);
 	    else
-		yaz_log(log_level, " ord=%d index_type=%c db=%s set=%d use=%d",
-		    ol->ord, index_type, db, set, use);
+		yaz_log(log_level, " ord=%d index_type=%s db=%s set=%d use=%d",
+                        ol->ord, index_type, db, set, use);
 	}
 	if (!strncmp (terms[i]->flags, "rank,", 5)) 
 	    (si->no_rank_entries)++;
@@ -148,7 +145,10 @@ static int calc (void *set_handle, zint sysno, zint staticrank,
 
     /* if we set *stop_flag = 1, we stop processing (of result set list) */
     /* staticrank = 0 is highest, MAXINT lowest */
-    return INT_MAX - staticrank;  /* but score is reverse (logical) */
+    if (staticrank >= INT_MAX)
+        return 0;
+    /* but score is reverse (logical) */
+    return INT_MAX - CAST_ZINT_TO_INT(staticrank);
 }
 
 /*