Follow of symlinks can be controlled with config followLinks and option -L

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

diff --git a/index/main.c b/index/main.c
index 8557655..91e3556 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.93 2002-08-02 19:26:55 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
 
@@ -84,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)
@@ -105,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)
@@ -119,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);
@@ -213,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
@@ -251,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);
     }