X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=c435b21701a2add68a39d73c8a92aa8d4c36882f;hb=12aa5211e599a051eca016ff5747a244accff884;hp=c721067d66e9442e5867afb20080fe207d506647;hpb=8f7cd01d361d4c2ebb375b05c98eb9e82cae4a43;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index c721067..c435b21 100644 --- a/index/main.c +++ b/index/main.c @@ -1,6 +1,6 @@ -/* $Id: main.c,v 1.103 2003-03-25 19:56:01 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: main.c,v 1.123 2005-01-21 13:23:25 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -20,8 +20,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include +#include #include #include #ifdef WIN32 @@ -35,11 +35,22 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#include -#include "zebraapi.h" +#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; @@ -47,19 +58,19 @@ int main (int argc, char **argv) char *arg; char *configName = 0; int nsections = 0; - int disableCommit = 0; - char *mem_max = 0; + int enable_commit = 1; + char *database = 0; + Res res = res_open(0, 0, 0); int trans_started=0; #if HAVE_SYS_TIMES_H struct tms tms1, tms2; struct timeval start_time, end_time; - long usec; + double usec; #endif #ifndef WIN32 char nbuf[100]; #endif - struct recordGroup rGroupDef; ZebraService zs = 0; ZebraHandle zh = 0; @@ -67,27 +78,13 @@ int main (int argc, char **argv) #ifdef WIN32 #else - sprintf(nbuf, "%.40s(%d)", *argv, getpid()); + sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid()); yaz_log_init_prefix (nbuf); #endif #if HAVE_SYS_TIMES_H times(&tms1); gettimeofday(&start_time, 0); #endif - - rGroupDef.groupName = NULL; - rGroupDef.databaseName = NULL; - rGroupDef.path = NULL; - rGroupDef.recordId = NULL; - rGroupDef.recordType = NULL; - rGroupDef.flagStoreData = -1; - rGroupDef.flagStoreKeys = -1; - rGroupDef.flagRw = 1; - rGroupDef.databaseNamePath = 0; - rGroupDef.explainDatabase = 0; - rGroupDef.fileVerboseLimit = 100000; - rGroupDef.followLinks = -1; - prog = *argv; if (argc < 2) { @@ -96,6 +93,8 @@ int main (int argc, char **argv) " update Update index with files below .\n" " If is empty filenames are read from stdin.\n" " delete Delete index with files below .\n" + " create Create database \n" + " drop Drop database \n" " commit Commit changes\n" " clean Clean shadow files\n" "Options:\n" @@ -124,40 +123,24 @@ int main (int argc, char **argv) if (!zs) { const char *config = configName ? configName : "zebra.cfg"; - logf (LOG_LOG, "Zebra version %s %s", + yaz_log (YLOG_LOG, "Zebra version %s %s", ZEBRAVER, ZEBRADATE); - zs = zebra_start (config); + zs = zebra_start_res (config, 0, res); if (!zs) { - yaz_log (LOG_FATAL, "Cannot read config %s", config); + yaz_log (YLOG_FATAL, "Cannot read config %s", config); exit (1); } zh = zebra_open (zs); - 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); - } + zebra_shadow_enable (zh, enable_commit); } - 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 (database && zebra_select_database (zh, database)) + { + yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d", + database, zebra_errCode(zh) ); + exit (1); + } if (!strcmp (arg, "update")) cmd = 'u'; else if (!strcmp (arg, "update1")) @@ -172,6 +155,14 @@ 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); @@ -184,7 +175,7 @@ int main (int argc, char **argv) { zebra_register_statistics (zh,0); } - else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict")) + else if (!strcmp (arg, "dumpdict")) { zebra_register_statistics (zh,1); } @@ -192,35 +183,42 @@ 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); + yaz_log (YLOG_FATAL, "unknown command: %s", arg); exit (1); } } else { - rGroupDef.path = arg; - zebra_set_group (zh, &rGroupDef); if (!trans_started) { trans_started=1; - zebra_begin_trans (zh, 1); + if (zebra_begin_trans (zh, 1)) + exit(1); } - switch (cmd) { case 'u': - zebra_repository_update (zh); + zebra_repository_update (zh, arg); break; case 'd': - zebra_repository_delete (zh); + zebra_repository_delete (zh, arg); break; case 's': - logf (LOG_LOG, "dumping %s", rGroupDef.path); - zebra_repository_show (zh); + zebra_repository_show (zh, arg); nsections = 0; break; + case 'C': + zebra_create_database(zh, arg); + break; + case 'D': + zebra_drop_database(zh, arg); + break; default: nsections = 0; } @@ -230,7 +228,7 @@ int main (int argc, char **argv) else if (ret == 'V') { printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE); - printf(" (C) 1994-2002, Index Data ApS\n"); + printf(" (C) 1994-2005, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG printf(" WIN32 Debug\n"); @@ -239,8 +237,7 @@ int main (int argc, char **argv) #endif #endif #if HAVE_BZLIB_H - printf("libbzip2\n" - " (C) 1996-1999 Julian R Seward. All rights reserved.\n"); + printf("Using: libbzip2, (C) 1996-1999 Julian R Seward. All rights reserved.\n"); #endif } else if (ret == 'v') @@ -248,25 +245,25 @@ int main (int argc, char **argv) else if (ret == 'l') yaz_log_init_file (arg); else if (ret == 'm') - mem_max = arg; + res_set(res, "memMax", arg); else if (ret == 'd') - rGroupDef.databaseName = arg; + database = arg; else if (ret == 's') - rGroupDef.flagRw = 0; + res_set(res, "openRW", "0"); else if (ret == 'g') - rGroupDef.groupName = arg; + res_set(res, "group", arg); else if (ret == 'f') - rGroupDef.fileVerboseLimit = atoi(arg); + res_set(res, "fileVerboseLimit", arg); else if (ret == 'c') configName = arg; else if (ret == 't') - rGroupDef.recordType = arg; + res_set(res, "recordType", arg); else if (ret == 'n') - disableCommit = 1; - else if (ret == 'L') - rGroupDef.followLinks = 0; + enable_commit = 0; + else if (ret == 'L') + res_set(res, "followLinks", "0"); else - logf (LOG_WARN, "unknown option '-%s'", arg); + yaz_log (YLOG_WARN, "unknown option '-%s'", arg); } /* while arg */ if (trans_started) @@ -278,11 +275,11 @@ int main (int argc, char **argv) if (trans_started) { gettimeofday(&end_time, 0); - usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L + + usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 + end_time.tv_usec - start_time.tv_usec; times(&tms2); - yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f", - (double) usec / 1000000.0, + yaz_log (YLOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f", + usec / 1000000, (double) (tms2.tms_utime - tms1.tms_utime)/100, (double) (tms2.tms_stime - tms1.tms_stime)/100); }