X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=66217cd48f5d02a292313bf83688e247d3df5a34;hb=5e7516d00451ada59a311fad05e8e3959242cdc7;hp=9f0572c2827ea3b657d9410ae7f00bcb85edc0c3;hpb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 9f0572c..66217cd 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,8 +1,8 @@ /* - * Copyright (C) 1995-2000, Index Data + * Copyright (C) 1995-2002, Index Data * All rights reserved. * - * $Id: zserver.c,v 1.85 2002-04-04 14:14:13 adam Exp $ + * $Id: zserver.c,v 1.87 2002-04-05 08:46:26 adam Exp $ */ #include @@ -62,7 +62,7 @@ bend_initresult *bend_init (bend_initrequest *q) sob = statserv_getcontrol (); if (!(zh = zebra_open (sob->handle))) { - logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname); + yaz_log (LOG_FATAL, "Failed to open config `%s'", sob->configname); r->errcode = 1; return r; } @@ -233,8 +233,12 @@ static int bend_scan (void *handle, bend_scan_rr *r) ZebraHandle zh = (ZebraHandle) handle; int is_partial, i; - zebra_select_databases (zh, r->num_bases, (const char **) r->basenames); - + if (zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames)) + { + zebra_result (zh, &r->errcode, &r->errstring); + return 0; + } r->entries = (struct scan_entry *) odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries); zebra_scan (zh, r->stream, r->term,