X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=11844d11ad7ab4282c02ceb3d48c6f7e7880f966;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=83a4c7bb95af312c7d84fff78666a1a010251f7e;hpb=ec214819d7b9e2f5c362584d8e38f83e13aae600;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 83a4c7b..11844d1 100644 --- a/index/main.c +++ b/index/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.113 2004-08-25 09:23:36 adam Exp $ +/* $Id: main.c,v 1.117 2004-09-28 20:09:13 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -20,7 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include #include #include @@ -35,19 +34,22 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#if HAVE_TCL_H -#include -#endif - -#if HAVE_EXPAT_H -#include -#endif - -#include +#include +#include #include char *prog; +static void filter_cb(void *cd, const char *name) +{ + puts (name); +} + +static void show_filters(ZebraService zs) +{ + zebra_filter_info(zs, 0, filter_cb); +} + int main (int argc, char **argv) { int ret; @@ -55,7 +57,7 @@ int main (int argc, char **argv) char *arg; char *configName = 0; int nsections = 0; - int disableCommit = 0; + int enable_commit = 1; char *database = "Default"; Res res = res_open(0, 0, 0); @@ -129,8 +131,7 @@ int main (int argc, char **argv) exit (1); } zh = zebra_open (zs); - if (disableCommit) - zebra_shadow_enable (zh, 0); + zebra_shadow_enable (zh, enable_commit); } if (zebra_select_database (zh, database)) @@ -181,6 +182,10 @@ int main (int argc, char **argv) { zebra_compact (zh); } + else if (!strcmp (arg, "filters")) + { + show_filters(zs); + } else { logf (LOG_FATAL, "unknown command: %s", arg); @@ -233,17 +238,6 @@ int main (int argc, char **argv) #if HAVE_BZLIB_H 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') yaz_log_init_level (yaz_log_mask_str(arg)); @@ -264,8 +258,8 @@ int main (int argc, char **argv) else if (ret == 't') res_set(res, "recordType", arg); else if (ret == 'n') - res_set(res, "disableCommit", "1"); - else if (ret == 'L') + enable_commit = 0; + else if (ret == 'L') res_set(res, "followLinks", "0"); else logf (LOG_WARN, "unknown option '-%s'", arg);