-/* $Id: main.c,v 1.115 2004-09-27 10:44:49 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: main.c,v 1.123 2005-01-21 13:23:25 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
02111-1307, USA.
*/
-
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
#ifdef WIN32
#include <sys/times.h>
#endif
-#include <data1.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
#include <idzebra/api.h>
char *prog;
char *configName = 0;
int nsections = 0;
int enable_commit = 1;
- char *database = "Default";
+ char *database = 0;
Res res = res_open(0, 0, 0);
int trans_started=0;
#ifdef WIN32
#else
- sprintf(nbuf, "%.40s(%d)", *argv, getpid());
+ sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid());
yaz_log_init_prefix (nbuf);
#endif
#if HAVE_SYS_TIMES_H
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
- logf (LOG_LOG, "Zebra version %s %s",
+ yaz_log (YLOG_LOG, "Zebra version %s %s",
ZEBRAVER, ZEBRADATE);
zs = zebra_start_res (config, 0, res);
if (!zs)
{
- yaz_log (LOG_FATAL, "Cannot read config %s", config);
+ yaz_log (YLOG_FATAL, "Cannot read config %s", config);
exit (1);
}
zh = zebra_open (zs);
zebra_shadow_enable (zh, enable_commit);
}
- if (zebra_select_database (zh, database))
+ if (database && zebra_select_database (zh, database))
{
- logf(LOG_FATAL, "Could not select database %s errCode=%d",
- database, zebra_errCode(zh) );
+ yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d",
+ database, zebra_errCode(zh) );
exit (1);
}
if (!strcmp (arg, "update"))
}
else
{
- logf (LOG_FATAL, "unknown command: %s", arg);
+ yaz_log (YLOG_FATAL, "unknown command: %s", arg);
exit (1);
}
}
else if (ret == 'V')
{
printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
- printf(" (C) 1994-2004, Index Data ApS\n");
+ printf(" (C) 1994-2005, Index Data ApS\n");
#ifdef WIN32
#ifdef _DEBUG
printf(" WIN32 Debug\n");
else if (ret == 'L')
res_set(res, "followLinks", "0");
else
- logf (LOG_WARN, "unknown option '-%s'", arg);
+ yaz_log (YLOG_WARN, "unknown option '-%s'", arg);
} /* while arg */
if (trans_started)
usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
end_time.tv_usec - start_time.tv_usec;
times(&tms2);
- yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
+ yaz_log (YLOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
usec / 1000000,
(double) (tms2.tms_utime - tms1.tms_utime)/100,
(double) (tms2.tms_stime - tms1.tms_stime)/100);