X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=f5073a1579e500579d07159fcf7fdc42560e7a1a;hb=d66990c38540b6196ede05d4b5636a9b51609134;hp=1ac5ce08599c104dbfba51987f1913f3672ea553;hpb=efcd52e23097c5fa48a5c6eacd3e1f6edc0e8e32;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 1ac5ce0..f5073a1 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,5 +1,5 @@
-/* $Id: main.c,v 1.97 2002-09-13 10:33:17 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: main.c,v 1.108 2003-11-24 12:58:00 mike Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -35,7 +35,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <sys/times.h>
 #endif
 
-#include <yaz/data1.h>
+#if HAVE_TCL_H
+#include <tcl.h>
+#endif
+
+#if HAVE_EXPAT_H
+#include <expat.h>
+#endif
+
+#include <data1.h>
 #include "zebraapi.h"
 
 char *prog;
@@ -48,12 +56,13 @@ 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;
-    long usec;
+    double usec;
 #endif
 #ifndef WIN32
     char nbuf[100];
@@ -95,6 +104,8 @@ int main (int argc, char **argv)
         " update <dir>  Update index with files below <dir>.\n"
 	"               If <dir> is empty filenames are read from stdin.\n"
         " delete <dir>  Delete index with files below <dir>.\n"
+        " create <db>   Create database <db>\n"
+        " drop <db>     Drop database <db>\n"
         " commit        Commit changes\n"
         " clean         Clean shadow files\n"
         "Options:\n"
@@ -135,16 +146,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';
@@ -160,19 +182,27 @@ int main (int argc, char **argv)
 		{
                     zebra_init (zh);
 		}
+		else if (!strcmp(arg, "drop"))
+		{
+		    cmd = 'D';
+		}
+		else if (!strcmp(arg, "create"))
+		{
+		    cmd = 'C';
+		}
                 else if (!strcmp (arg, "commit"))
                 {
                     zebra_commit (zh);
                 }
                 else if (!strcmp (arg, "clean"))
                 {
-                    assert (!"todo");
+                    zebra_clean (zh);
                 }
                 else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
                 {
                     zebra_register_statistics (zh,0);
                 }
-                else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict"))
+                else if (!strcmp (arg, "dumpdict"))
                 {
                     zebra_register_statistics (zh,1);
                 }
@@ -193,9 +223,9 @@ int main (int argc, char **argv)
 		if (!trans_started)
 		{
 		    trans_started=1;
-                    zebra_begin_trans (zh);
+                    if (zebra_begin_trans (zh, 1))
+                        exit(1);
 		}
-
                 switch (cmd)
                 {
                 case 'u':
@@ -209,6 +239,12 @@ int main (int argc, char **argv)
                     zebra_repository_show (zh);
                     nsections = 0;
                     break;
+		case 'C':
+		    zebra_create_database(zh, rGroupDef.path);
+		    break;
+		case 'D':
+		    zebra_drop_database(zh, rGroupDef.path);
+		    break;
                 default:
                     nsections = 0;
                 }
@@ -217,18 +253,28 @@ int main (int argc, char **argv)
         }
         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-2003, 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("Using: libbzip2, (C) 1996-1999 Julian R Seward.  All rights reserved.\n");
+#endif
+#if HAVE_TCL_H
+	    printf("Using: Tcl %s\n", TCL_VERSION);
+#endif
+#if HAVE_EXPAT_H
+	    if (1)
+	    {
+		XML_Expat_Version v = XML_ExpatVersionInfo();
+		printf ("Using: Expat %d.%d.%d\n",
+			v.major, v.minor, v.micro);
+	    }
 #endif
         }
         else if (ret == 'v')
@@ -236,7 +282,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')
@@ -263,15 +309,19 @@ int main (int argc, char **argv)
     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) * 1000000.0 +
 	    end_time.tv_usec - start_time.tv_usec;
-    times(&tms2);
-    yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
-		(double) usec / 1000000.0,
+        times(&tms2);
+        yaz_log (LOG_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);
+    }
 #endif
+    nmem_exit();
     exit (0);
     return 0;
 }