X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraidx.c;h=4fabc5df02367738db3bf567bfed6b09c1867d07;hp=3494e19f6f60bfc77f644665d8961b05675ba656;hb=e4c6861efeeea654bfb00c5f0239ee258629d77f;hpb=5a0bd8219f5265caf462c669ba9557b8d7fc2aed diff --git a/index/zebraidx.c b/index/zebraidx.c index 3494e19..4fabc5d 100644 --- a/index/zebraidx.c +++ b/index/zebraidx.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2011 Index Data + Copyright (C) 2004-2013 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 @@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -59,7 +62,7 @@ int main(int argc, char **argv) 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]; @@ -84,6 +87,7 @@ int main(int argc, char **argv) " drop Drop database \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 Index files as (grs or text).\n" " -c Read configuration file .\n" @@ -116,7 +120,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); } @@ -179,9 +183,19 @@ int main(int argc, char **argv) } else if (!strncmp(arg, "check", 5)) { - if (zebra_register_check(zh, 10) != ZEBRA_OK) - yaz_log(YLOG_WARN, "register check failed"); - } + const char *spec = 0; + if (arg[5] == ':') + spec = arg + 6; + else if (arg[5] != '\0') + { + yaz_log(YLOG_FATAL, "missing colon after check"); + exit(1); + } + if (zebra_register_check(zh, spec) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_register_check failed"); + } + } else { yaz_log(YLOG_FATAL, "unknown command: %s", arg); @@ -226,7 +240,7 @@ int main(int argc, char **argv) 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"); @@ -246,7 +260,7 @@ int main(int argc, char **argv) zebra_get_version(version_str, sys_str); printf("Zebra %s\n", version_str); - printf("(C) 1994-2010, Index Data ApS\n"); + printf("(C) 1994-2013, 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("SHA1 ID: %s\n", sys_str);