data1 part of zebra

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

diff --git a/index/main.c b/index/main.c
index 91e3556..8cdc106 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.96 2002-09-03 11:44:54 adam Exp $
+/* $Id: main.c,v 1.100 2002-10-22 12:51:08 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -35,7 +35,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <sys/times.h>
 #endif
 
-#include <yaz/data1.h>
+#include <data1.h>
 #include "zebraapi.h"
 
 char *prog;
@@ -48,7 +48,9 @@ int main (int argc, char **argv)
     char *configName = 0;
     int nsections = 0;
     int disableCommit = 0;
-    size_t mem_max = 0;
+    char *mem_max = 0;
+    
+    int trans_started=0;
 #if HAVE_SYS_TIMES_H
     struct tms tms1, tms2;
     struct timeval start_time, end_time;
@@ -134,16 +136,27 @@ int main (int argc, char **argv)
                     if (disableCommit)
                         zebra_shadow_enable (zh, 0);
                 }
+
                 if (rGroupDef.databaseName)
                 {
                     if (zebra_select_database (zh, rGroupDef.databaseName))
+                   {
+                       logf(LOG_FATAL, "Could not select database %s errCode=%d",
+                                         rGroupDef.databaseName, zebra_errCode(zh) );
                         exit (1);
+                   }
                 }
                 else
                 {
                     if (zebra_select_database (zh, "Default"))
+                   {
+                       logf(LOG_FATAL, "Could not select database Default errCode=%d",
+                                       zebra_errCode(zh) );
                         exit (1);
+                   }
                 }
+               if (mem_max)
+                   zebra_set_resource(zh, "memmax",mem_max); 
 
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
@@ -189,7 +202,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)
                 {
@@ -207,25 +224,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')
@@ -233,7 +248,7 @@ int main (int argc, char **argv)
        else if (ret == 'l')
            yaz_log_init_file (arg);
         else if (ret == 'm')
-            mem_max = 1024*1024*atoi(arg);
+            mem_max = arg; 
         else if (ret == 'd')
             rGroupDef.databaseName = arg;
        else if (ret == 's')
@@ -252,18 +267,25 @@ int main (int argc, char **argv)
             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;