projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug #529. On Unix, combine pthreed locks with file locking because file
[idzebra-moved-to-github.git]
/
index
/
ranksimilarity.c
diff --git
a/index/ranksimilarity.c
b/index/ranksimilarity.c
index
cf553d1
..
9455bcc
100644
(file)
--- a/
index/ranksimilarity.c
+++ b/
index/ranksimilarity.c
@@
-1,4
+1,4
@@
-/* $Id: ranksimilarity.c,v 1.8 2006-05-11 10:26:13 marc Exp $
+/* $Id: ranksimilarity.c,v 1.10 2006-06-07 10:50:08 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-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 index_type = 0;
const char *db = 0;
const char *string_index = 0;
- int set = -1;
- int use = -1;
zebraExplain_lookup_ord(reg->zei,
zebraExplain_lookup_ord(reg->zei,
- ol->ord, &index_type, &db, &set, &use,
+ ol->ord, &index_type, &db,
&string_index);
&string_index);
-
+
no_docs_fieldindex
+= zebraExplain_ord_get_doc_occurrences(reg->zei, ol->ord);
no_terms_fieldindex
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,
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;
}
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 */
/* 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 */
/* debugging statistics output */