X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraidx.c;h=db31bb7fb3a97f91a00282f33206a56ae542cad4;hp=804a7e821677728ac9b5c29bf92c422866f8653b;hb=8a0144a3925311102133d62ac6258ace8d7187eb;hpb=c19bdb08393eb7b97f7783cb576f223b4fc505ed

diff --git a/index/zebraidx.c b/index/zebraidx.c
index 804a7e8..db31bb7 100644
--- a/index/zebraidx.c
+++ b/index/zebraidx.c
@@ -1,8 +1,5 @@
-/* $Id: zebraidx.c,v 1.10 2007-11-08 09:30:05 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <unistd.h>
 #endif
 
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
 #include <yaz/icu.h>
 #endif
 #include <yaz/log.h>
@@ -57,12 +57,11 @@ int main(int argc, char **argv)
     int cmd = 0;
     char *arg;
     char *configName = 0;
-    int nsections = 0;
     int enable_commit = 1;
     char *database = 0;
     Res res = res_open(0, 0);
     Res default_res = res_open(0, 0);
-    
+
     int trans_started = 0;
 #ifndef WIN32
     char nbuf[100];
@@ -87,6 +86,7 @@ int main(int argc, char **argv)
         " drop <db>     Drop database <db>\n"
         " commit        Commit changes\n"
         " clean         Clean shadow files\n"
+        " check mode    Check register; mode is one of: default, full, quick\n"
         "Options:\n"
 	" -t <type>     Index files as <type> (grs or text).\n"
 	" -c <config>   Read configuration file <config>.\n"
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
     {
         if (ret == 0)
         {
-            if(cmd == 0) /* command */
+            if (cmd == 0) /* command */
             {
                 if (!zs)
                 {
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
                     {
 			yaz_log(YLOG_FATAL, "Cannot read config %s", config);
                         exit(1);
-	            }	
+	            }
                     zh = zebra_open(zs, 0);
 		    zebra_shadow_enable(zh, enable_commit);
                 }
@@ -142,6 +142,8 @@ int main(int argc, char **argv)
                     cmd = 's';
                 else if (!strcmp(arg, "del") || !strcmp(arg, "delete"))
                     cmd = 'd';
+                else if (!strcmp(arg, "adelete"))
+                    cmd = 'a';
 		else if (!strcmp(arg, "init"))
 		{
                     zebra_init(zh);
@@ -178,6 +180,10 @@ int main(int argc, char **argv)
                 {
                     show_filters(zs);
                 }
+		else if (!strcmp(arg, "check"))
+		{
+                    cmd = 'K';
+ 		}
                 else
                 {
                     yaz_log(YLOG_FATAL, "unknown command: %s", arg);
@@ -189,21 +195,26 @@ int main(int argc, char **argv)
 		ZEBRA_RES res = ZEBRA_OK;
 		if (!trans_started)
 		{
-		    trans_started=1;
+		    trans_started = 1;
                     if (zebra_begin_trans(zh, 1) != ZEBRA_OK)
                         exit(1);
 		}
                 switch (cmd)
                 {
+                case 'K':
+                    res = zebra_register_check(zh, arg);
+                    break;
                 case 'u':
-                    res = zebra_repository_update(zh, arg);
+                    res = zebra_repository_index(zh, arg, action_update);
                     break;
                 case 'd':
-                    res = zebra_repository_delete(zh, arg);
+                    res = zebra_repository_index(zh, arg, action_delete);
+                    break;
+                case 'a':
+                    res = zebra_repository_index(zh, arg, action_a_delete);
                     break;
                 case 's':
                     res = zebra_repository_show(zh, arg);
-                    nsections = 0;
                     break;
 		case 'C':
 		    res = zebra_create_database(zh, arg);
@@ -211,15 +222,13 @@ int main(int argc, char **argv)
 		case 'D':
 		    res = zebra_drop_database(zh, arg);
 		    break;
-                default:
-                    nsections = 0;
                 }
 		if (res != ZEBRA_OK)
 		{
                     const char *add = zebra_errAdd(zh);
 		    yaz_log(YLOG_FATAL, "Operation failed: %s %s",
                             zebra_errString(zh), add ? add : "");
-                    
+
                     if (trans_started)
                         if (zebra_end_trans(zh) != ZEBRA_OK)
                             yaz_log(YLOG_WARN, "zebra_end_trans failed");
@@ -239,13 +248,13 @@ int main(int argc, char **argv)
             zebra_get_version(version_str, sys_str);
 
             printf("Zebra %s\n", version_str);
-	    printf("(C) 1994-2007, Index Data ApS\n");
+	    printf("(C) 1994-2014, Index Data\n");
             printf("Zebra is free software, covered by the GNU General Public License, and you are\n");
             printf("welcome to change it and/or distribute copies of it under certain conditions.\n");
-            printf("Configured as: %s\n", sys_str);
+            printf("SHA1 ID: %s\n", sys_str);
             if (strcmp(version_str, ZEBRAVER))
                 printf("zebraidx compiled version %s\n", ZEBRAVER);
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
             printf("Using ICU\n");
 #endif
         }
@@ -275,22 +284,27 @@ int main(int argc, char **argv)
             yaz_log(YLOG_WARN, "unknown option '-%s'", arg);
     } /* while arg */
 
+    ret = 0;
     if (trans_started)
         if (zebra_end_trans(zh) != ZEBRA_OK)
+        {
             yaz_log(YLOG_WARN, "zebra_end_trans failed");
+            ret = 1;
+        }
 
     zebra_close(zh);
     zebra_stop(zs);
 
     res_close(res);
     res_close(default_res);
-    exit(0);
+    exit(ret);
     return 0;
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab