Honor position attribute, i.e. allow first-in-field search. To

[idzebra-moved-to-github.git] / index / ranksimilarity.c

diff --git a/index/ranksimilarity.c b/index/ranksimilarity.c
index cf553d1..26dbe1f 100644 (file)
--- a/index/ranksimilarity.c
+++ b/index/ranksimilarity.c
@@ -1,5 +1,5 @@
-/* $Id: ranksimilarity.c,v 1.8 2006-05-11 10:26:13 marc Exp $
-   Copyright (C) 1995-2005
+/* $Id: ranksimilarity.c,v 1.11 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 <stdio.h>
@@ -228,13 +228,11 @@ static void *begin (struct zebra_register *reg,
               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, &set, &use,
+                                      ol->ord, &index_type, &db,
                                       &string_index);
-
+              
               no_docs_fieldindex 
                   += zebraExplain_ord_get_doc_occurrences(reg->zei, ol->ord);
               no_terms_fieldindex 
@@ -246,8 +244,8 @@ static void *begin (struct zebra_register *reg,
                         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);
+                        "begin()    index: ord=%d type=%c db=%s",
+                        ol->ord, index_type, db);
             }
      
           si->entries[i].no_docs_fieldindex = no_docs_fieldindex;
@@ -368,7 +366,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 */