X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Franksimilarity.c;h=ce7f22ebd902f58f0d24659793105424450b466e;hp=cf553d1d4bee01c86912ed0a39846c7ea20c3c12;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=1d94ccc48442dc0b08cbc6db585b9ecab261e1ba

diff --git a/index/ranksimilarity.c b/index/ranksimilarity.c
index cf553d1..ce7f22e 100644
--- a/index/ranksimilarity.c
+++ b/index/ranksimilarity.c
@@ -1,8 +1,5 @@
-/* $Id: ranksimilarity.c,v 1.8 2006-05-11 10:26:13 marc 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-2010 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>
@@ -225,29 +222,27 @@ 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;
-              int use = -1;
 
               zebraExplain_lookup_ord(reg->zei,
-                                      ol->ord, &index_type, &db, &set, &use,
+                                      ol->ord, &index_type, &db,
                                       &string_index);
-
+              
               no_docs_fieldindex 
                   += zebraExplain_ord_get_doc_occurrences(reg->zei, ol->ord);
               no_terms_fieldindex 
                   += zebraExplain_ord_get_term_occurrences(reg->zei, ol->ord);
 
               if (string_index)
-		yaz_log(log_level, 
-                        "begin()    index: ord=%d type=%c db=%s str-index=%s",
-                        ol->ord, index_type, db, string_index);
+                  yaz_log(log_level, 
+                          "begin()    index: ord=%d type=%s db=%s str-index=%s",
+                          ol->ord, index_type, db, string_index);
               else
-		yaz_log(log_level, 
-                        "begin()    index: ord=%d type=%c db=%s set=%d use=%d",
-                        ol->ord, index_type, db, set, use);
+                  yaz_log(log_level, 
+                          "begin()    index: ord=%d type=%s db=%s",
+                          ol->ord, index_type, db);
             }
      
           si->entries[i].no_docs_fieldindex = no_docs_fieldindex;
@@ -368,7 +363,12 @@ static int calc (void *set_handle, zint sysno, zint staticrank,
  
 
   /* staticrank = 0 is highest, MAXINT lowest */
-  score = INT_MAX - staticrank;  /* but score is reverse (logical) */
+  if (staticrank >= INT_MAX)
+    score = 0;
+  else
+  { /* but score is reverse (logical) */
+    score = INT_MAX - CAST_ZINT_TO_INT(staticrank);
+  }
 
 
   /* debugging statistics output */
@@ -409,6 +409,7 @@ struct rank_control *rank_similarity_class = &rank_control;
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab