X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frankstatic.c;h=d313fe36ff30c2fecd00ca3137757327d6d1c46a;hb=54453c3aa60e354161680de92b95a279ef6a0916;hp=9abc7ec50c82454664b61556e0bbcf11a5ea044c;hpb=d95fcf3ebd1d19bc0bd15e0efc69c6efa40a0423;p=idzebra-moved-to-github.git

diff --git a/index/rankstatic.c b/index/rankstatic.c
index 9abc7ec..d313fe3 100644
--- a/index/rankstatic.c
+++ b/index/rankstatic.c
@@ -1,4 +1,4 @@
-/* $Id: rankstatic.c,v 1.3 2005-08-19 11:04:23 adam Exp $
+/* $Id: rankstatic.c,v 1.8 2006-06-07 10:50:08 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include "index.h"
+#include "rank.h"
 
 static int log_level = 0;
 static int log_initialized = 0;
@@ -83,8 +84,29 @@ static void *begin (struct zebra_register *reg,
     si->no_rank_entries = 0;
     for (i = 0; i < numterms; i++)
     {
+	struct ord_list *ol = terms[i]->ol;
+
         yaz_log(log_level, "i=%d flags=%s '%s'", i, 
                 terms[i]->flags, terms[i]->name );
+
+	for (; ol; ol = ol->next)
+	{
+	    int index_type = 0;
+	    const char *db = 0;
+	    const char *string_index = 0;
+	    int set = -1;
+	    int use = -1;
+
+	    zebraExplain_lookup_ord(reg->zei,
+				    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);
+	    else
+		yaz_log(log_level, " ord=%d index_type=%c db=%s set=%d use=%d",
+		    ol->ord, index_type, db, set, use);
+	}
 	if (!strncmp (terms[i]->flags, "rank,", 5)) 
 	    (si->no_rank_entries)++;
     }
@@ -126,7 +148,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);
 }
 
 /*
@@ -158,3 +183,11 @@ static struct rank_control rank_control = {
 };
  
 struct rank_control *rank_static_class = &rank_control;
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+