X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=60384699468a345a9ee2915fc44f67531df0d7dd;hb=e63cb633d580e1a364de81d4f24fb2c9fa70e279;hp=2313a500212e69f4365002cbbb54996f4fc49a42;hpb=22963c0b23a178529bc71e5879c7e4f9c3c9b7f9;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 2313a50..6038469 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,6 +1,6 @@
-/* $Id: main.c,v 1.116 2004-09-28 10:15:03 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: main.c,v 1.124 2005-05-11 12:39:36 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
@@ -36,6 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #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
@@ -112,8 +113,7 @@ int main (int argc, char **argv)
                  );
         exit (1);
     }
-    while ((ret = options ("sVt:c:g:d:m:v:nf:l:L"
-			   , argv, argc, &arg)) != -2)
+    while ((ret = options("sVt:c:g:d:m:v:nf:l:L", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -122,22 +122,24 @@ 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) == ZEBRA_FAIL)
 		{
-		    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,46 +190,52 @@ int main (int argc, char **argv)
                 }
                 else
                 {
-                    logf (LOG_FATAL, "unknown command: %s", arg);
+                    yaz_log (YLOG_FATAL, "unknown command: %s", arg);
                     exit (1);
                 }
             }
 	    else
             {
+		ZEBRA_RES res = ZEBRA_OK;
 		if (!trans_started)
 		{
 		    trans_started=1;
-                    if (zebra_begin_trans (zh, 1))
+                    if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
                         exit(1);
 		}
                 switch (cmd)
                 {
                 case 'u':
-                    zebra_repository_update (zh, arg);
+                    res = zebra_repository_update (zh, arg);
                     break;
                 case 'd':
-                    zebra_repository_delete (zh, arg);
+                    res = zebra_repository_delete (zh, arg);
                     break;
                 case 's':
-                    zebra_repository_show (zh, arg);
+                    res = zebra_repository_show (zh, arg);
                     nsections = 0;
                     break;
 		case 'C':
-		    zebra_create_database(zh, arg);
+		    res = zebra_create_database(zh, arg);
 		    break;
 		case 'D':
-		    zebra_drop_database(zh, arg);
+		    res = zebra_drop_database(zh, arg);
 		    break;
                 default:
                     nsections = 0;
                 }
+		if (res != ZEBRA_OK)
+		{
+		    yaz_log(YLOG_WARN, "Operation failed");
+		    exit(1);
+		}
                 log_event_end (NULL, NULL);
             }
         }
         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 +270,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 +285,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);