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
added sysno and matchStr (if exists) to logging of add/update/delete indexing operati...
[idzebra-moved-to-github.git]
/
index
/
zvrank.c
diff --git
a/index/zvrank.c
b/index/zvrank.c
index
8bf3224
..
88433bf
100644
(file)
--- a/
index/zvrank.c
+++ b/
index/zvrank.c
@@
-1,4
+1,4
@@
-/* $Id: zvrank.c,v 1.15 2005-01-15 19:38:30 adam Exp $
+/* $Id: zvrank.c,v 1.20 2006-05-03 09:31:26 marc Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-52,9
+52,10
@@
fernuni-hagen.de>
#endif
#include "index.h"
#endif
#include "index.h"
+#include "rank.h"
-static int log_level=0;
-static int log_initialized=0;
+static int log_level = 0;
+static int log_initialized = 0;
static double blog(double x) {
/* log_2, log_e or log_10 is used, best to change it here if necessary */
static double blog(double x) {
/* log_2, log_e or log_10 is used, best to change it here if necessary */
@@
-342,7
+343,7
@@
static void idf_squared(void *rsi, void *dsi) {
if (gocc==0)
idf=0.0;
else
if (gocc==0)
idf=0.0;
else
- idf=blog(num_docs/gocc);
+ idf=blog(CAST_ZINT_TO_DOUBLE(num_docs/gocc));
idf=idf*idf;
ds->terms[i].idf=idf;
}
idf=idf*idf;
ds->terms[i].idf=idf;
}
@@
-669,13
+670,13
@@
static void *zv_create (ZebraHandle zh) {
xmalloc (sizeof(*ci));
if (!log_initialized)
{
xmalloc (sizeof(*ci));
if (!log_initialized)
{
- log_level=yaz_log_module_level("zvrank");
- log_initialized=1;
+ log_level = yaz_log_module_level("zvrank");
+ log_initialized = 1;
}
yaz_log(log_level, "zv_create");
}
yaz_log(log_level, "zv_create");
- wscheme=res_get_def(res, "zvrank.weighting-scheme", "");
- for (i=0; wscheme[i] && i < 8; i++)
+ wscheme= res_get_def(res, "zvrank.weighting-scheme", "");
+ for (i = 0; wscheme[i] && i < 8; i++)
ci->rscheme[i]=wscheme[i];
ci->rscheme[i] = '\0';
return ci;
ci->rscheme[i]=wscheme[i];
ci->rscheme[i] = '\0';
return ci;
@@
-782,7
+783,7
@@
static void zv_add (void *rsi, int seqno, TERMID term) {
* score should be between 0 and 1000. If score cannot be obtained
* -1 should be returned.
*/
* score should be between 0 and 1000. If score cannot be obtained
* -1 should be returned.
*/
-static int zv_calc (void *rsi, zint sysno)
+static int zv_calc (void *rsi, zint sysno, zint staticrank, int *stop_flag)
{
int i, veclen;
int score=0;
{
int i, veclen;
int score=0;
@@
-839,6
+840,5
@@
static struct rank_control rank_control_vsm = {
zv_add,
};
zv_add,
};
-struct rank_control *rankzv_class = &rank_control_vsm;
+struct rank_control *rank_zv_class = &rank_control_vsm;
-/* EOF */