Fixed bug #253: Setting group.database not honored.

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

diff --git a/index/main.c b/index/main.c
index 392a7d4..c435b21 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,6 +1,6 @@
-/* $Id: main.c,v 1.115 2004-09-27 10:44:49 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: main.c,v 1.123 2005-01-21 13:23:25 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,8 +20,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #ifdef WIN32
@@ -35,7 +35,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <sys/times.h>
 #endif
 
-#include <data1.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
 #include <idzebra/api.h>
 
 char *prog;
@@ -58,7 +59,7 @@ int main (int argc, char **argv)
     char *configName = 0;
     int nsections = 0;
     int enable_commit = 1;
-    char *database = "Default";
+    char *database = 0;
     Res res = res_open(0, 0, 0);
     
     int trans_started=0;
@@ -77,7 +78,7 @@ int main (int argc, char **argv)
 
 #ifdef WIN32
 #else
-    sprintf(nbuf, "%.40s(%d)", *argv, getpid());
+    sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid());
     yaz_log_init_prefix (nbuf);
 #endif
 #if HAVE_SYS_TIMES_H
@@ -122,22 +123,22 @@ int main (int argc, char **argv)
                 if (!zs)
                 {
                    const char *config = configName ? configName : "zebra.cfg";
-                    logf (LOG_LOG, "Zebra version %s %s",
+                    yaz_log (YLOG_LOG, "Zebra version %s %s",
                           ZEBRAVER, ZEBRADATE);
                     zs = zebra_start_res (config, 0, res);
                     if (!zs)
                     {
-                       yaz_log (LOG_FATAL, "Cannot read config %s", config);
+                       yaz_log (YLOG_FATAL, "Cannot read config %s", config);
                         exit (1);
                    }   
                     zh = zebra_open (zs);
                    zebra_shadow_enable (zh, enable_commit);
                 }
 
-               if (zebra_select_database (zh, database))
+               if (database && zebra_select_database (zh, database))
                {
-                   logf(LOG_FATAL, "Could not select database %s errCode=%d",
-                        database, zebra_errCode(zh) );
+                   yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d",
+                           database, zebra_errCode(zh) );
                    exit (1);
                }
                 if (!strcmp (arg, "update"))
@@ -188,7 +189,7 @@ int main (int argc, char **argv)
                 }
                 else
                 {
-                    logf (LOG_FATAL, "unknown command: %s", arg);
+                    yaz_log (YLOG_FATAL, "unknown command: %s", arg);
                     exit (1);
                 }
             }
@@ -227,7 +228,7 @@ int main (int argc, char **argv)
         else if (ret == 'V')
         {
             printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
-           printf(" (C) 1994-2004, Index Data ApS\n");
+           printf(" (C) 1994-2005, Index Data ApS\n");
 #ifdef WIN32
 #ifdef _DEBUG
             printf(" WIN32 Debug\n");
@@ -262,7 +263,7 @@ int main (int argc, char **argv)
        else if (ret == 'L')
            res_set(res, "followLinks", "0");
         else
-            logf (LOG_WARN, "unknown option '-%s'", arg);
+            yaz_log (YLOG_WARN, "unknown option '-%s'", arg);
     } /* while arg */
 
     if (trans_started)
@@ -277,7 +278,7 @@ int main (int argc, char **argv)
         usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
            end_time.tv_usec - start_time.tv_usec;
         times(&tms2);
-        yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
+        yaz_log (YLOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
                usec / 1000000,
                (double) (tms2.tms_utime - tms1.tms_utime)/100,
                (double) (tms2.tms_stime - tms1.tms_stime)/100);