Changed/removed various internal log mesages

[idzebra-moved-to-github.git] / index / main.c

diff --git a/index/main.c b/index/main.c
index 1540f5b..91e3556 100644 (file)
--- 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.96 2002-09-03 11:44:54 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 <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <time.h>
 #ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
+#include <sys/time.h>
 #endif
+#include <time.h>
 #if HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
@@ -66,6 +84,7 @@ int main (int argc, char **argv)
     rGroupDef.databaseNamePath = 0;
     rGroupDef.explainDatabase = 0;
     rGroupDef.fileVerboseLimit = 100000;
+    rGroupDef.followLinks = -1;
 
     prog = *argv;
     if (argc < 2)
@@ -87,12 +106,13 @@ int main (int argc, char **argv)
        " -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)
@@ -101,16 +121,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);
@@ -150,7 +169,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 +214,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
@@ -229,6 +248,8 @@ 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);
     }