X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraidx.c;h=c41190195493277e2c6567bedbb8ec6946ef3a24;hp=a1378a29aa8debc1af22ff3192a5b5a559f4856a;hb=16853a7593f10680ea8d6895aa0720b9af3779e6;hpb=d82c0efad7971d102220a8824e1ea674db5b7fe2 diff --git a/index/zebraidx.c b/index/zebraidx.c index a1378a2..c411901 100644 --- a/index/zebraidx.c +++ b/index/zebraidx.c @@ -1,8 +1,5 @@ -/* $Id: zebraidx.c,v 1.9 2007-10-29 09:25:41 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) 1994-2010 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 @@ -31,8 +28,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#if HAVE_ICU -#include +#if YAZ_HAVE_ICU +#include #endif #include #include @@ -142,6 +139,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 +177,11 @@ int main(int argc, char **argv) { show_filters(zs); } + else if (!strcmp(arg, "check")) + { + if (zebra_register_check(zh) != ZEBRA_OK) + yaz_log(YLOG_WARN, "register check failed"); + } else { yaz_log(YLOG_FATAL, "unknown command: %s", arg); @@ -196,10 +200,13 @@ int main(int argc, char **argv) switch (cmd) { 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); @@ -239,13 +246,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-2010, Index Data ApS\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 } @@ -291,6 +298,7 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab