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
Using yaz_match_glob from YAZ.
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
93c9ad9
..
b8f3936
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.257 2007-08-21 11:06:47 adam Exp $
+/* $Id: zebraapi.c,v 1.259 2007-08-28 21:40:57 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-192,6
+192,8
@@
ZebraService zebra_start(const char *configName)
ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
{
Res res;
ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
{
Res res;
+ char version_str[16];
+ char system_str[80];
zebra_flock_init();
zebra_flock_init();
@@
-201,7
+203,9
@@
ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
log_level_initialized = 1;
}
log_level_initialized = 1;
}
- yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+ zebra_get_version(version_str, system_str);
+
+ yaz_log(YLOG_LOG, "zebra_start %s %s", version_str,
configName ? configName : "");
if ((res = res_open(def_res, over_res)))
configName ? configName : "");
if ((res = res_open(def_res, over_res)))
@@
-1288,8
+1292,7
@@
int zebra_deleteResultSet(ZebraHandle zh, int function,
{
int i, status;
ASSERTZH;
{
int i, status;
ASSERTZH;
- assert(statuses);
- yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
+ yaz_log(log_level, "zebra_deleteResultSet n=%d", num_setnames);
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;