X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=d9574c71256530bcae0fa915dc44c403aa4e9ada;hb=41d642cfebfa415417f3825fd805012d7a47fe96;hp=bedca40b5297bf2fcaccb4a3ba074b7d00335110;hpb=b91ce3324c28145911b703dfe4e4c0ddb12d6532;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index bedca40..d9574c7 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.94 2002-08-05 14:08:08 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
 
@@ -49,6 +49,7 @@ 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;
@@ -84,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)
@@ -105,12 +107,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,11 +122,15 @@ int main (int argc, char **argv)
             {
                 if (!zs)
                 {
+		    const char *config = configName ? configName : "zebra.cfg";
                     logf (LOG_LOG, "Zebra version %s %s",
                           ZEBRAVER, ZEBRADATE);
-                    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);
@@ -183,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)
                 {
@@ -201,25 +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')
         {
-            fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
-	    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')
@@ -242,20 +251,29 @@ 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
-    gettimeofday(&end_time, 0);
-    usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L +
+    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",
+        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;