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 support for static ranking. Bug #174. The staticrank is enabled
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
5995610
..
8a48f7a
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.180 2005-08-09 09:35:25 adam Exp $
+/* $Id: zebraapi.c,v 1.182 2005-08-18 12:50:17 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-126,6
+126,7
@@
ZebraHandle zebra_open (ZebraService zs)
zh->lock_shadow = 0;
zh->shadow_enable = 1;
zh->lock_shadow = 0;
zh->shadow_enable = 1;
+ zh->m_staticrank = 0;
default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
@@
-172,9
+173,9
@@
ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
log_level = yaz_log_module_level("zebraapi");
log_level_initialized = 1;
}
log_level = yaz_log_module_level("zebraapi");
log_level_initialized = 1;
}
-
- yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER);
- assert(configName);
+
+ yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+ configName ? configName : "");
if ((res = res_open (configName, def_res, over_res)))
{
if ((res = res_open (configName, def_res, over_res)))
{
@@
-182,10
+183,7
@@
ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
const char *passwd_encrypt = 0;
ZebraService zh = xmalloc(sizeof(*zh));
const char *passwd_encrypt = 0;
ZebraService zh = xmalloc(sizeof(*zh));
- yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
-
zh->global_res = res;
zh->global_res = res;
- zh->configName = xstrdup(configName);
zh->sessions = 0;
zebra_chdir (zh);
zh->sessions = 0;
zebra_chdir (zh);
@@
-511,7
+509,6
@@
ZEBRA_RES zebra_stop(ZebraService zs)
recTypeClass_destroy(zs->record_classes);
nmem_destroy(zs->nmem);
res_close (zs->global_res);
recTypeClass_destroy(zs->record_classes);
nmem_destroy(zs->nmem);
res_close (zs->global_res);
- xfree(zs->configName);
xfree(zs);
return ZEBRA_OK;
}
xfree(zs);
return ZEBRA_OK;
}
@@
-703,6
+700,13
@@
static void zebra_select_register (ZebraHandle zh, const char *new_reg)
if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK)
zebra_set_approx_limit(zh, approx);
}
if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK)
zebra_set_approx_limit(zh, approx);
}
+ if (zh->res)
+ {
+ if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
+ yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
+ else
+ yaz_log(YLOG_LOG, "static rank unset");
+ }
}
void map_basenames_func (void *vp, const char *name, const char *value)
}
void map_basenames_func (void *vp, const char *name, const char *value)
@@
-2036,7
+2040,6
@@
const char *zebra_get_resource(ZebraHandle zh,
const char *v;
ASSERTZH;
assert(name);
const char *v;
ASSERTZH;
assert(name);
- assert(defaultvalue);
v = res_get_def (zh->res, name, (char *)defaultvalue);
zebra_clearError(zh);
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
v = res_get_def (zh->res, name, (char *)defaultvalue);
zebra_clearError(zh);
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);