Implemented drop database

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

diff --git a/index/main.c b/index/main.c
index d9574c7..11dbfb3 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,5 +1,5 @@
-/* $Id: main.c,v 1.98 2002-10-04 18:15:09 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: main.c,v 1.105 2003-06-30 19:37:12 adam 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,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,8 @@ 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;
@@ -95,6 +96,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 +138,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 +174,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 +215,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 +231,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;
                 }
@@ -236,7 +264,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')
@@ -275,6 +303,7 @@ int main (int argc, char **argv)
                (double) (tms2.tms_stime - tms1.tms_stime)/100);
     }
 #endif
+    nmem_exit();
     exit (0);
     return 0;
 }