X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=d9574c71256530bcae0fa915dc44c403aa4e9ada;hb=41d642cfebfa415417f3825fd805012d7a47fe96;hp=05c5a435410534d4be40d09e371d03552958d176;hpb=7d9280e88954e1abd67db88bfed1096ce30814d1;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 05c5a43..d9574c7 100644 --- a/index/main.c +++ b/index/main.c @@ -1,9 +1,26 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * - * $Id: main.c,v 1.86 2002-04-15 13:48:10 adam Exp $ - */ +/* $Id: main.c,v 1.98 2002-10-04 18:15:09 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 @@ -11,6 +28,11 @@ #include #else #include +#include +#endif +#include +#if HAVE_SYS_TIMES_H +#include #endif #include @@ -27,6 +49,12 @@ int main (int argc, char **argv) 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; + long usec; +#endif #ifndef WIN32 char nbuf[100]; #endif @@ -41,6 +69,10 @@ int main (int argc, char **argv) sprintf(nbuf, "%.40s(%d)", *argv, getpid()); yaz_log_init_prefix (nbuf); #endif +#if HAVE_SYS_TIMES_H + times(&tms1); + gettimeofday(&start_time, 0); +#endif rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; @@ -53,6 +85,7 @@ int main (int argc, char **argv) rGroupDef.databaseNamePath = 0; rGroupDef.explainDatabase = 0; rGroupDef.fileVerboseLimit = 100000; + rGroupDef.followLinks = -1; prog = *argv; if (argc < 2) @@ -74,12 +107,13 @@ int main (int argc, char **argv) " -s Show analysis on stdout, but do no work.\n" " -v Set logging to .\n" " -l Write log to .\n" + " -L Don't follow symbolic links.\n" " -f Display information for the first 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) @@ -88,16 +122,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); @@ -137,7 +170,11 @@ int main (int argc, char **argv) } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - assert (!"todo"); + zebra_register_statistics (zh,0); + } + else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict")) + { + zebra_register_statistics (zh,1); } else if (!strcmp (arg, "compact")) { @@ -153,7 +190,11 @@ int main (int argc, char **argv) { rGroupDef.path = arg; zebra_set_group (zh, &rGroupDef); - zebra_begin_trans (zh); + if (!trans_started) + { + trans_started=1; + zebra_begin_trans (zh); + } switch (cmd) { @@ -171,29 +212,23 @@ int main (int argc, char **argv) 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"); + printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE); + printf(" (C) 1994-2002, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG - fprintf (stderr, " WIN32 Debug\n"); + printf(" WIN32 Debug\n"); #else - fprintf (stderr, " WIN32 Release\n"); + printf(" WIN32 Release\n"); #endif #endif #if HAVE_BZLIB_H - fprintf (stderr, "libbzip2\n" - " (C) 1996-1999 Julian R Seward. All rights reserved.\n"); + printf("libbzip2\n" + " (C) 1996-1999 Julian R Seward. All rights reserved.\n"); #endif } else if (ret == 'v') @@ -216,11 +251,30 @@ int main (int argc, char **argv) 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 + if (trans_started) + { + gettimeofday(&end_time, 0); + usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L + + end_time.tv_usec - start_time.tv_usec; + times(&tms2); + yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f", + (double) usec / 1000000.0, + (double) (tms2.tms_utime - tms1.tms_utime)/100, + (double) (tms2.tms_stime - tms1.tms_stime)/100); + } +#endif exit (0); return 0; }