X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrasrv.c;h=d7989774b7ffcd2348051aacd99437b2ec554290;hb=4b4d00c51b49de97fca1d5e2ae10d943c116c916;hp=bbc354a7ea0d34d74e2a44d1f299fe1253b5ce1a;hpb=538b41355b5607b4bd09c9c98682694fd6628940;p=idzebra-moved-to-github.git diff --git a/index/zebrasrv.c b/index/zebrasrv.c index bbc354a..d798977 100644 --- a/index/zebrasrv.c +++ b/index/zebrasrv.c @@ -1,4 +1,4 @@ -/* $Id: zebrasrv.c,v 1.7 2007-01-17 13:22:53 adam Exp $ +/* $Id: zebrasrv.c,v 1.10 2007-02-02 13:48:13 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -262,7 +262,7 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r) } -static int busy_handler(void *client_data, ZebraHandle zh) +static int break_handler(void *client_data) { bend_association assoc =(bend_association) client_data; if (!bend_assoc_is_alive(assoc)) @@ -283,7 +283,7 @@ int bend_search(void *handle, bend_search_rr *r) zebra_result (zh, &r->errcode, &r->errstring); return 0; } - zebra_set_busy_handler(zh, busy_handler, r->association); + zebra_set_break_handler(zh, break_handler, r->association); yaz_log (YLOG_DEBUG, "ResultSet '%s'", r->setname); switch (r->query->which) { @@ -309,7 +309,7 @@ int bend_search(void *handle, bend_search_rr *r) default: r->errcode = YAZ_BIB1_QUERY_TYPE_UNSUPP; } - zebra_set_busy_handler(zh, 0, 0); + zebra_set_break_handler(zh, 0, 0); return 0; } @@ -776,7 +776,7 @@ static void bend_start (struct statserv_options_block *sob) zebra_stop((ZebraService) sob->handle); res_set(default_res, "profilePath", DEFAULT_PROFILE_PATH); res_set(default_res, "modulePath", DEFAULT_MODULE_PATH); - sob->handle = zebra_start(sob->configname); + sob->handle = zebra_start_res(sob->configname, default_res, 0); res_close(default_res); if (!sob->handle) {