-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- *
- * $Id: main.c,v 1.92 2002-07-11 13:03:01 heikki Exp $
- */
+/* $Id: main.c,v 1.97 2002-09-13 10:33:17 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
int nsections = 0;
int disableCommit = 0;
size_t mem_max = 0;
+ int trans_started=0;
#if HAVE_SYS_TIMES_H
struct tms tms1, tms2;
struct timeval start_time, end_time;
rGroupDef.databaseNamePath = 0;
rGroupDef.explainDatabase = 0;
rGroupDef.fileVerboseLimit = 100000;
+ rGroupDef.followLinks = -1;
prog = *argv;
if (argc < 2)
" -s Show analysis on stdout, but do no work.\n"
" -v <level> Set logging to <level>.\n"
" -l <file> Write log to <file>.\n"
+ " -L Don't follow symbolic links.\n"
" -f <n> Display information for the first <n> records.\n"
" -V Show version.\n", *argv
);
exit (1);
}
- while ((ret = options ("sVt:c:g:d:m:v:nf:l:"
+ while ((ret = options ("sVt:c:g:d:m:v:nf:l:L"
, argv, argc, &arg)) != -2)
{
if (ret == 0)
{
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);
{
rGroupDef.path = arg;
zebra_set_group (zh, &rGroupDef);
- zebra_begin_trans (zh);
+ if (!trans_started)
+ {
+ trans_started=1;
+ zebra_begin_trans (zh);
+ }
switch (cmd)
{
default:
nsections = 0;
}
- cmd = 0;
- zebra_end_trans (zh);
log_event_end (NULL, NULL);
}
}
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
rGroupDef.recordType = arg;
else if (ret == 'n')
disableCommit = 1;
+ else if (ret == 'L')
+ rGroupDef.followLinks = 0;
else
logf (LOG_WARN, "unknown option '-%s'", arg);
- }
+ } /* while arg */
+
+ if (trans_started)
+ zebra_end_trans (zh);
+
zebra_close (zh);
zebra_stop (zs);
#if HAVE_SYS_TIMES_H