X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=bedca40b5297bf2fcaccb4a3ba074b7d00335110;hb=b91ce3324c28145911b703dfe4e4c0ddb12d6532;hp=1540f5b96e4020ec6cf0f9f545004590416ef632;hpb=1e739c60397fc5274dba921252b63df2664bdb49;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 1540f5b..bedca40 100644 --- a/index/main.c +++ b/index/main.c @@ -1,18 +1,36 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * - * $Id: main.c,v 1.90 2002-06-19 11:37:11 adam Exp $ - */ +/* $Id: main.c,v 1.94 2002-08-05 14:08:08 adam 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 #include #include -#include #ifdef WIN32 #include #else #include +#include #endif +#include #if HAVE_SYS_TIMES_H #include #endif @@ -101,13 +119,8 @@ int main (int argc, char **argv) { if (!zs) { -#if ZMBOL - logf (LOG_LOG, "Z'mbol version %s %s", - ZEBRAVER, ZEBRADATE); -#else logf (LOG_LOG, "Zebra version %s %s", ZEBRAVER, ZEBRADATE); -#endif zs = zebra_start (configName ? configName : "zebra.cfg"); if (!zs) exit (1); @@ -150,7 +163,11 @@ int main (int argc, char **argv) } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - zebra_register_statistics (zh); + zebra_register_statistics (zh,0); + } + else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict")) + { + zebra_register_statistics (zh,1); } else if (!strcmp (arg, "compact")) { @@ -191,11 +208,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