X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fmain.c;h=3def79224ebc678f6f84641b508856c6b48c4d6f;hp=f0512c21235843def6605dc2d9363c51d425eb81;hb=b3890b03023cb9904ac1b10e2eee86669246d1dd;hpb=b0af93f1eaf72822168b479ce83d91ccad3546a3 diff --git a/index/main.c b/index/main.c index f0512c2..3def792 100644 --- a/index/main.c +++ b/index/main.c @@ -1,9 +1,26 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * - * $Id: main.c,v 1.88 2002-04-23 18:09:05 adam Exp $ - */ +/* $Id: main.c,v 1.107 2003-10-07 09:18:43 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 + Index Data Aps + +This file is part of the Zebra server. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #include @@ -11,12 +28,22 @@ #include #else #include +#include #endif +#include #if HAVE_SYS_TIMES_H #include #endif -#include +#if HAVE_TCL_H +#include +#endif + +#if HAVE_EXPAT_H +#include +#endif + +#include #include "zebraapi.h" char *prog; @@ -29,9 +56,13 @@ int main (int argc, char **argv) char *configName = 0; int nsections = 0; int disableCommit = 0; - size_t mem_max = 0; + char *mem_max = 0; + + int trans_started=0; #if HAVE_SYS_TIMES_H struct tms tms1, tms2; + struct timeval start_time, end_time; + long usec; #endif #ifndef WIN32 char nbuf[100]; @@ -49,6 +80,7 @@ int main (int argc, char **argv) #endif #if HAVE_SYS_TIMES_H times(&tms1); + gettimeofday(&start_time, 0); #endif rGroupDef.groupName = NULL; @@ -62,6 +94,7 @@ int main (int argc, char **argv) rGroupDef.databaseNamePath = 0; rGroupDef.explainDatabase = 0; rGroupDef.fileVerboseLimit = 100000; + rGroupDef.followLinks = -1; prog = *argv; if (argc < 2) @@ -71,6 +104,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" @@ -83,12 +118,13 @@ int main (int argc, char **argv) " -s Show analysis on stdout, but do no work.\n" " -v Set logging to .\n" " -l Write log to .\n" + " -L Don't follow symbolic links.\n" " -f Display information for the first records.\n" " -V Show version.\n", *argv ); exit (1); } - while ((ret = options ("sVt:c:g:d:m:v:nf:l:" + while ((ret = options ("sVt:c:g:d:m:v:nf:l:L" , argv, argc, &arg)) != -2) { if (ret == 0) @@ -97,30 +133,40 @@ int main (int argc, char **argv) { if (!zs) { -#if ZMBOL - logf (LOG_LOG, "Z'mbol version %s %s", - ZEBRAVER, ZEBRADATE); -#else + const char *config = configName ? configName : "zebra.cfg"; logf (LOG_LOG, "Zebra version %s %s", ZEBRAVER, ZEBRADATE); -#endif - zs = zebra_start (configName ? configName : "zebra.cfg"); + zs = zebra_start (config); if (!zs) + { + yaz_log (LOG_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); + } } 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 (!strcmp (arg, "update")) cmd = 'u'; @@ -136,17 +182,29 @@ 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")) { - assert (!"todo"); + zebra_register_statistics (zh,0); + } + else if (!strcmp (arg, "dumpdict")) + { + zebra_register_statistics (zh,1); } else if (!strcmp (arg, "compact")) { @@ -162,8 +220,12 @@ int main (int argc, char **argv) { 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': @@ -177,32 +239,42 @@ int main (int argc, char **argv) zebra_repository_show (zh); nsections = 0; break; + case 'C': + zebra_create_database(zh, rGroupDef.path); + break; + case 'D': + zebra_drop_database(zh, rGroupDef.path); + break; default: nsections = 0; } - cmd = 0; - zebra_end_trans (zh); log_event_end (NULL, NULL); } } else if (ret == 'V') { -#if ZMBOL - fprintf (stderr, "Z'mbol %s %s\n", ZEBRAVER, ZEBRADATE); -#else - fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); -#endif - fprintf (stderr, " (C) 1994-2002, Index Data ApS\n"); + printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE); + printf(" (C) 1994-2003, 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') @@ -210,7 +282,7 @@ 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); + mem_max = arg; else if (ret == 'd') rGroupDef.databaseName = arg; else if (ret == 's') @@ -225,17 +297,31 @@ int main (int argc, char **argv) rGroupDef.recordType = arg; else if (ret == 'n') disableCommit = 1; + else if (ret == 'L') + rGroupDef.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 - times(&tms2); - yaz_log (LOG_LOG, "zebraidx user/system: %ld/%ld", - (long) tms2.tms_utime - tms1.tms_utime, - (long) tms2.tms_stime - tms1.tms_stime); + if (trans_started) + { + gettimeofday(&end_time, 0); + usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L + + 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, + (double) (tms2.tms_utime - tms1.tms_utime)/100, + (double) (tms2.tms_stime - tms1.tms_stime)/100); + } #endif + nmem_exit(); exit (0); return 0; }