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
Make passwd_-vars local. Make zebra_start log Zebra version
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
7c4fccd
..
9ff2d7c
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.170 2005-05-30 13:27:08 adam Exp $
+/* $Id: zebraapi.c,v 1.172 2005-05-31 17:10:06 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-154,8
+154,6
@@
ZebraHandle zebra_open (ZebraService zs)
return zh;
}
return zh;
}
- const char *passwd_plain = 0;
- const char *passwd_encrypt = 0;
ZebraService zebra_start (const char *configName)
{
return zebra_start_res(configName, 0, 0);
ZebraService zebra_start (const char *configName)
{
return zebra_start_res(configName, 0, 0);
@@
-171,11
+169,13
@@
ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
log_level_initialized = 1;
}
log_level_initialized = 1;
}
- yaz_log(log_level, "zebra_start %s",configName);
+ yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER);
assert(configName);
if ((res = res_open (configName, def_res, over_res)))
{
assert(configName);
if ((res = res_open (configName, def_res, over_res)))
{
+ const char *passwd_plain = 0;
+ const char *passwd_encrypt = 0;
ZebraService zh = xmalloc(sizeof(*zh));
yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
ZebraService zh = xmalloc(sizeof(*zh));
yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
@@
-944,6
+944,9
@@
ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
{
char *buf;
int len;
{
char *buf;
int len;
+
+ zebra_get_hit_vector(zh, setname, poset[i].sysno);
+
recs[i].errCode =
zebra_record_fetch(zh, poset[i].sysno, poset[i].score,
stream, input_format, comp,
recs[i].errCode =
zebra_record_fetch(zh, poset[i].sysno, poset[i].score,
stream, input_format, comp,