X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=8a1dac47cdf50da28ab504be6085b3524c3eb151;hb=191ceffa0af0cc1048ef11a1bf92fece3210c879;hp=f14aaec95404115f7511100cb39f28657e9ca90e;hpb=3bf301b46354151f3ed2ece4ad69b98f73db15fa;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index f14aaec..8a1dac4 100644 --- a/index/main.c +++ b/index/main.c @@ -1,5 +1,5 @@ -/* $Id: main.c,v 1.106 2003-09-16 13:58:25 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 +/* $Id: main.c,v 1.114 2004-09-26 20:38:50 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps This file is part of the Zebra server. @@ -39,8 +39,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif +#if HAVE_EXPAT_H +#include +#endif + #include -#include "zebraapi.h" +#include char *prog; @@ -51,19 +55,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 = "Default"; + 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; @@ -78,20 +82,6 @@ int main (int argc, char **argv) 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) { @@ -132,38 +122,22 @@ int main (int argc, char **argv) const char *config = configName ? configName : "zebra.cfg"; logf (LOG_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); exit (1); } zh = zebra_open (zs); - if (disableCommit) - zebra_shadow_enable (zh, 0); + zebra_shadow_enable (zh, enable_commit); } - 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); - } - } - 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 (zebra_select_database (zh, database)) + { + logf(LOG_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")) @@ -214,8 +188,6 @@ int main (int argc, char **argv) } else { - rGroupDef.path = arg; - zebra_set_group (zh, &rGroupDef); if (!trans_started) { trans_started=1; @@ -225,21 +197,20 @@ int main (int argc, char **argv) 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, rGroupDef.path); + zebra_create_database(zh, arg); break; case 'D': - zebra_drop_database(zh, rGroupDef.path); + zebra_drop_database(zh, arg); break; default: nsections = 0; @@ -250,7 +221,7 @@ int main (int argc, char **argv) else if (ret == 'V') { printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE); - printf(" (C) 1994-2003, Index Data ApS\n"); + printf(" (C) 1994-2004, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG printf(" WIN32 Debug\n"); @@ -264,29 +235,37 @@ int main (int argc, char **argv) #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)); 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; + enable_commit = 0; else if (ret == 'L') - rGroupDef.followLinks = 0; + res_set(res, "followLinks", "0"); else logf (LOG_WARN, "unknown option '-%s'", arg); } /* while arg */ @@ -300,11 +279,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, + usec / 1000000, (double) (tms2.tms_utime - tms1.tms_utime)/100, (double) (tms2.tms_stime - tms1.tms_stime)/100); }