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
2007.
[idzebra-moved-to-github.git]
/
index
/
zebrasrv.c
diff --git
a/index/zebrasrv.c
b/index/zebrasrv.c
index
3283d5f
..
7112234
100644
(file)
--- 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.
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;
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)
{
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);
}
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";
{
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)
{
static void bend_start (struct statserv_options_block *sob)
{
+ Res default_res = res_open(0, 0);
+
if (sob->handle)
zebra_stop((ZebraService) sob->handle);
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);
sob->handle = zebra_start(sob->configname);
+ res_close(default_res);
if (!sob->handle)
{
yaz_log (YLOG_FATAL, "Failed to read config `%s'", sob->configname);
if (!sob->handle)
{
yaz_log (YLOG_FATAL, "Failed to read config `%s'", sob->configname);