X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=59ecac78fd8c924ca0e3136f037cb33b39cc5853;hb=2a6f64379961f30bfe6376964ce279ab5242da1f;hp=91e35566a3a3187ced627915d5be3871c789a015;hpb=4a617d48ef8d8516c83bf49fac1206b580ba537e;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 91e3556..59ecac7 100644 --- a/index/main.c +++ b/index/main.c @@ -1,5 +1,5 @@ -/* $Id: main.c,v 1.96 2002-09-03 11:44:54 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: main.c,v 1.110 2004-01-22 11:27:21 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. @@ -35,7 +35,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#include +#if HAVE_TCL_H +#include +#endif + +#if HAVE_EXPAT_H +#include +#endif + +#include #include "zebraapi.h" char *prog; @@ -48,16 +56,18 @@ int main (int argc, char **argv) char *configName = 0; int nsections = 0; int disableCommit = 0; - size_t mem_max = 0; + 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; @@ -72,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) { @@ -94,6 +90,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,7 +122,7 @@ 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 (config, 0, res); if (!zs) { yaz_log (LOG_FATAL, "Cannot read config %s", config); @@ -134,17 +132,13 @@ int main (int argc, char **argv) if (disableCommit) zebra_shadow_enable (zh, 0); } - if (rGroupDef.databaseName) - { - if (zebra_select_database (zh, rGroupDef.databaseName)) - exit (1); - } - else - { - if (zebra_select_database (zh, "Default")) - exit (1); - } + 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")) @@ -159,19 +153,27 @@ 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); } else if (!strcmp (arg, "clean")) { - assert (!"todo"); + zebra_clean (zh); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { zebra_register_statistics (zh,0); } - else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict")) + else if (!strcmp (arg, "dumpdict")) { zebra_register_statistics (zh,1); } @@ -187,45 +189,60 @@ int main (int argc, char **argv) } else { - rGroupDef.path = arg; - zebra_set_group (zh, &rGroupDef); - zebra_begin_trans (zh); - + if (!trans_started) + { + trans_started=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; } - cmd = 0; - zebra_end_trans (zh); log_event_end (NULL, NULL); } } else if (ret == 'V') { - fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); - fprintf (stderr, " (C) 1994-2002, Index Data ApS\n"); + printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE); + printf(" (C) 1994-2004, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG - fprintf (stderr, " WIN32 Debug\n"); + printf(" WIN32 Debug\n"); #else - fprintf (stderr, " WIN32 Release\n"); + printf(" WIN32 Release\n"); #endif #endif #if HAVE_BZLIB_H - fprintf (stderr, "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 +#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') @@ -233,38 +250,46 @@ int main (int argc, char **argv) else if (ret == 'l') yaz_log_init_file (arg); else if (ret == 'm') - mem_max = 1024*1024*atoi(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, "verboseLimit", 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; + res_set(res, "disableCommit", "1"); else if (ret == 'L') - rGroupDef.followLinks = 0; + res_set(res, "followLinks", "0"); else logf (LOG_WARN, "unknown option '-%s'", arg); - } + } /* while arg */ + + if (trans_started) + zebra_end_trans (zh); + zebra_close (zh); zebra_stop (zs); #if HAVE_SYS_TIMES_H - gettimeofday(&end_time, 0); - usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L + + if (trans_started) + { + gettimeofday(&end_time, 0); + 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, + times(&tms2); + yaz_log (LOG_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); + } #endif + nmem_exit(); exit (0); return 0; }