X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=02101ab8959a0a2b540dd6b6966403732224a784;hb=54da2f13bc20e4369757453575668339c8dfd9fd;hp=85576554ee4782476b1aebaefc2cd6d88fe16250;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 8557655..02101ab 100644 --- a/index/main.c +++ b/index/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.93 2002-08-02 19:26:55 adam Exp $ +/* $Id: main.c,v 1.95 2002-08-29 08:47:08 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -119,16 +119,15 @@ int main (int argc, char **argv) { if (!zs) { -#if ZMBOL - logf (LOG_LOG, "Z'mbol version %s %s", - ZEBRAVER, ZEBRADATE); -#else + const char *config = configName ? configName : "zebra.cfg"; logf (LOG_LOG, "Zebra version %s %s", ZEBRAVER, ZEBRADATE); -#endif - zs = zebra_start (configName ? configName : "zebra.cfg"); + zs = zebra_start (config); if (!zs) + { + yaz_log (LOG_FATAL, "Cannot read config %s", config); exit (1); + } zh = zebra_open (zs); if (disableCommit) zebra_shadow_enable (zh, 0); @@ -213,11 +212,7 @@ int main (int argc, char **argv) } else if (ret == 'V') { -#if ZMBOL - fprintf (stderr, "Z'mbol %s %s\n", ZEBRAVER, ZEBRADATE); -#else fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); -#endif fprintf (stderr, " (C) 1994-2002, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG