X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebrasrv.c;h=7112234e8cf488e408cfc1191d458c156ed7c233;hb=5a8a42bede922e70156e7b289db071592c71529b;hp=3283d5f16c8fbcc3e7fe96d7a275dcd23fb277a7;hpb=20d1df123f3e5be61a77687223952430ac184cd9;p=idzebra-moved-to-github.git diff --git a/index/zebrasrv.c b/index/zebrasrv.c index 3283d5f..7112234 100644 --- a/index/zebrasrv.c +++ b/index/zebrasrv.c @@ -1,5 +1,5 @@ -/* $Id: zebrasrv.c,v 1.1 2006-09-22 10:18:08 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: zebrasrv.c,v 1.5 2007-01-15 15:10:17 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -585,8 +585,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) Z_External *rec = notToKeep->elements[i]->record; struct oident *oident = 0; Odr_oct *opaque_recid = 0; - SYSNO *sysno = 0; - SYSNO sysno_tmp; + zint *sysno = 0; + zint sysno_tmp; if (notToKeep->elements[i]->u.opaque) { @@ -630,7 +630,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.octet_aligned->len, rec->u.octet_aligned->buf); } - if (oident && oident->value != VAL_TEXT_XML) + if (oident && oident->value != VAL_TEXT_XML + && oident->value != VAL_SUTRS) { rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "only XML update supported"; @@ -756,9 +757,14 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) static void bend_start (struct statserv_options_block *sob) { + Res default_res = res_open(0, 0); + if (sob->handle) 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); + res_close(default_res); if (!sob->handle) { yaz_log (YLOG_FATAL, "Failed to read config `%s'", sob->configname);