X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=b8f39363ae061b369cbd4de2c7fa6d502721c12c;hb=87f0188b0b31dde5f5510a30b17a89f45384f271;hp=10a49548963e15a067ee9e99c4c468e693627332;hpb=8174591e6c5c002acca0db83c4c46e1d0265a9e2;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 10a4954..b8f3936 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.256 2007-05-21 11:54:59 adam Exp $ +/* $Id: zebraapi.c,v 1.259 2007-08-28 21:40:57 adam Exp $ 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; + char version_str[16]; + char system_str[80]; zebra_flock_init(); @@ -201,7 +203,9 @@ ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res) 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))) @@ -1144,7 +1148,8 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream, hit_snippet); #endif recs[i].errCode = - zebra_record_fetch(zh, poset[i].sysno, poset[i].score, + zebra_record_fetch(zh, setname, + poset[i].sysno, poset[i].score, hit_snippet, stream, input_format, comp, &recs[i].format, &buf, &len, @@ -1287,8 +1292,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function, { 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;