X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fmain.c;h=071e1ec3e90d85cc5f4889680fa591a51517c320;hp=60310e449c860a4360694a06a99906cfc0dd8553;hb=47eeb5384a8fae8bcac8afb8a84782ca094683f9;hpb=3d9f3bffb46938b54ea2aaf3738d8579fdcfdebd diff --git a/index/main.c b/index/main.c index 60310e4..071e1ec 100644 --- a/index/main.c +++ b/index/main.c @@ -1,77 +1,97 @@ -/* - * Copyright (C) 1994-2001, Index Data - * All rights reserved. - * - * $Id: main.c,v 1.81 2001-11-19 23:29:09 adam Exp $ - */ +/* $Id: main.c,v 1.125 2005-06-14 20:28:54 adam Exp $ + Copyright (C) 1995-2005 + 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 #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif - -#include -#include "index.h" -#include "recindex.h" - -#ifndef ZEBRASDR -#define ZEBRASDR 0 +#if HAVE_SYS_TIME_H +#include #endif - -#if ZEBRASDR -#include "zebrasdr.h" +#include +#if HAVE_SYS_TIMES_H +#include #endif +#include +#include +#include + char *prog; -Res common_resource = 0; +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; int cmd = 0; char *arg; - char *configName = FNAME_CONFIG; + char *configName = 0; int nsections = 0; - int disableCommit = 0; - size_t 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; + double usec; +#endif +#if HAVE_SYS_TIME_H + struct timeval start_time, end_time; +#endif #ifndef WIN32 char nbuf[100]; #endif - struct recordGroup rGroupDef; + ZebraService zs = 0; + ZebraHandle zh = 0; nmem_init (); #ifdef WIN32 #else - sprintf(nbuf, "%.40s(%d)", *argv, getpid()); + sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid()); yaz_log_init_prefix (nbuf); #endif - -#if ZEBRASDR - zebraSdr_std (); - rGroupDef.useSDR = 0; +#if HAVE_SYS_TIMES_H + times(&tms1); +#endif +#if HAVE_SYS_TIME_H + 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.zebra_maps = NULL; - rGroupDef.dh = data1_create (); - rGroupDef.recTypes = recTypes_init (rGroupDef.dh); - recTypes_default_handlers (rGroupDef.recTypes); - prog = *argv; if (argc < 2) { @@ -80,6 +100,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" @@ -92,56 +114,41 @@ 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" -#if ZEBRASDR - " -S Use SDRKit\n" -#endif " -V Show version.\n", *argv ); exit (1); } - while ((ret = options ("sVt:c:g:d:m:v:nf:l:" -#if ZEBRASDR - "S" -#endif - , argv, argc, &arg)) != -2) + while ((ret = options("sVt:c:g:d:m:v:nf:l:L", argv, argc, &arg)) != -2) { if (ret == 0) { - const char *rval; if(cmd == 0) /* command */ { - if (!common_resource) + if (!zs) { -#if ZMBOL - logf (LOG_LOG, "zmbol version %s %s", + const char *config = configName ? configName : "zebra.cfg"; + yaz_log (YLOG_LOG, "Zebra version %s %s", ZEBRAVER, ZEBRADATE); -#else - logf (LOG_LOG, "zebra version %s %s", - ZEBRAVER, ZEBRADATE); -#endif - common_resource = res_open (configName ? - configName : FNAME_CONFIG); - if (!common_resource) + zs = zebra_start_res (config, 0, res); + if (!zs) { - logf (LOG_FATAL, "cannot read file `%s'", configName); + yaz_log (YLOG_FATAL, "Cannot read config %s", config); exit (1); - } - data1_set_tabpath (rGroupDef.dh, res_get (common_resource, - "profilePath")); - - rGroupDef.bfs = - bfs_create (res_get (common_resource, "register")); - if (!rGroupDef.bfs) - { - logf (LOG_FATAL, "Cannot access register"); - exit(1); - } - - bf_lockDir (rGroupDef.bfs, - res_get (common_resource, "lockDir")); - rGroupDef.zebra_maps = zebra_maps_open (common_resource); + } + zh = zebra_open (zs); + zebra_shadow_enable (zh, enable_commit); } + + if (database && + zebra_select_database (zh, database) == ZEBRA_FAIL) + { + 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")) @@ -154,188 +161,97 @@ int main (int argc, char **argv) cmd = 'd'; else if (!strcmp (arg, "init")) { - zebraIndexUnlock(); - rval = res_get (common_resource, "shadow"); - zebraIndexLock (rGroupDef.bfs, 0, rval); - if (rval && *rval) - bf_cache (rGroupDef.bfs, rval); - zebraIndexLockMsg ("w"); - bf_reset (rGroupDef.bfs); + zebra_init (zh); + } + else if (!strcmp(arg, "drop")) + { + cmd = 'D'; + } + else if (!strcmp(arg, "create")) + { + cmd = 'C'; } else if (!strcmp (arg, "commit")) { - rval = res_get (common_resource, "shadow"); - zebraIndexLock (rGroupDef.bfs, 1, rval); - if (rval && *rval) - bf_cache (rGroupDef.bfs, rval); - else - { - logf (LOG_FATAL, "Cannot perform commit"); - logf (LOG_FATAL, "No shadow area defined"); - exit (1); - } - if (bf_commitExists (rGroupDef.bfs)) - { - logf (LOG_LOG, "commit start"); - zebraIndexLockMsg ("c"); - zebraIndexWait (1); - logf (LOG_LOG, "commit execute"); - bf_commitExec (rGroupDef.bfs); -#ifndef WIN32 - sync (); -#endif - zebraIndexLockMsg ("d"); - zebraIndexWait (0); - logf (LOG_LOG, "commit clean"); - bf_commitClean (rGroupDef.bfs, rval); - } - else - logf (LOG_LOG, "nothing to commit"); + zebra_commit (zh); } else if (!strcmp (arg, "clean")) { - rval = res_get (common_resource, "shadow"); - zebraIndexLock (rGroupDef.bfs, 1, rval); - if (bf_commitExists (rGroupDef.bfs)) - { - zebraIndexLockMsg ("d"); - zebraIndexWait (0); - logf (LOG_LOG, "commit clean"); - bf_commitClean (rGroupDef.bfs, rval); - } - else - logf (LOG_LOG, "nothing to clean"); + zebra_clean (zh); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - Records records; - rval = res_get (common_resource, "shadow"); - zebraIndexLock (rGroupDef.bfs, 0, rval); - if (rval && *rval) - { - bf_cache (rGroupDef.bfs, rval); - zebraIndexLockMsg ("r"); - } - records = rec_open (rGroupDef.bfs, 0, 0); - rec_prstat (records); - rec_close (&records); - inv_prstat (rGroupDef.bfs); + zebra_register_statistics (zh,0); + } + else if (!strcmp (arg, "dumpdict")) + { + zebra_register_statistics (zh,1); } else if (!strcmp (arg, "compact")) { - rval = res_get (common_resource, "shadow"); - zebraIndexLock (rGroupDef.bfs, 0, rval); - if (rval && *rval) - { - bf_cache (rGroupDef.bfs, rval); - zebraIndexLockMsg ("r"); - } - inv_compact(rGroupDef.bfs); + 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 { - struct recordGroup rGroup; -#if ZMBOL -#else - /* For zebra, delete lock file and reset register */ - if (rGroupDef.flagRw) + ZEBRA_RES res = ZEBRA_OK; + if (!trans_started) { - zebraIndexUnlock(); - bf_reset (rGroupDef.bfs); - } -#endif - rval = res_get (common_resource, "shadow"); - zebraIndexLock (rGroupDef.bfs, 0, rval); - if (rGroupDef.flagRw) - { - if (rval && *rval && !disableCommit) - { - bf_cache (rGroupDef.bfs, rval); - zebraIndexLockMsg ("r"); - } - else - { - bf_cache (rGroupDef.bfs, 0); - zebraIndexLockMsg ("w"); - } - zebraIndexWait (0); + trans_started=1; + if (zebra_begin_trans (zh, 1) != ZEBRA_OK) + exit(1); } - memcpy (&rGroup, &rGroupDef, sizeof(rGroup)); - rGroup.path = arg; switch (cmd) { case 'u': - if (!key_open (&rGroup, mem_max)) - { - logf (LOG_LOG, "updating %s", rGroup.path); - repositoryUpdate (&rGroup); - nsections = key_close (&rGroup); - } - break; - case 'U': - if (!key_open (&rGroup, mem_max)) - { - logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); - repositoryUpdate (&rGroup); - key_close (&rGroup); - } - nsections = 0; + res = zebra_repository_update (zh, arg); break; case 'd': - if (!key_open (&rGroup,mem_max)) - { - logf (LOG_LOG, "deleting %s", rGroup.path); - repositoryDelete (&rGroup); - nsections = key_close (&rGroup); - } + res = zebra_repository_delete (zh, arg); break; case 's': - logf (LOG_LOG, "dumping %s", rGroup.path); - repositoryShow (&rGroup); + res = zebra_repository_show (zh, arg); nsections = 0; break; - case 'm': - nsections = -1; - break; + case 'C': + res = zebra_create_database(zh, arg); + break; + case 'D': + res = zebra_drop_database(zh, arg); + break; default: nsections = 0; } - cmd = 0; - if (nsections) - { - logf (LOG_LOG, "merging with index"); - key_input (rGroup.bfs, nsections, 60, common_resource); -#ifndef WIN32 - sync (); -#endif - } + if (res != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "Operation failed"); + exit(1); + } 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-2001, Index Data ApS\n"); + printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE); + printf(" (C) 1994-2005, 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 } else if (ret == 'v') @@ -343,35 +259,48 @@ 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, "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; -#if ZEBRASDR - else if (ret == 'S') - rGroupDef.useSDR = 1; -#endif + enable_commit = 0; + else if (ret == 'L') + res_set(res, "followLinks", "0"); else - logf (LOG_WARN, "unknown option '-%s'", arg); - } - recTypes_destroy (rGroupDef.recTypes); - if (common_resource) + yaz_log (YLOG_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 +#if HAVE_SYS_TIME_H + if (trans_started) { - zebraIndexUnlock (); - bfs_destroy (rGroupDef.bfs); + 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 (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); } - data1_destroy (rGroupDef.dh); +#endif +#endif + nmem_exit(); exit (0); return 0; }