X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=d238bb9559c416276bd4326fd0dc5b80ee2cca4e;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=1a3fc7665504e39238aa8d435f9962bf46165a9c;hpb=5a47fb16ab0fc9574660a0ed04151f359c826cbf;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 1a3fc76..d238bb9 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,50 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1996, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.37 1996-03-19 12:43:26 adam + * Revision 1.48 1997-09-09 13:38:08 adam + * Partial port to WIN95/NT. + * + * Revision 1.47 1997/02/12 20:39:46 adam + * Implemented options -f that limits the log to the first + * records. + * Changed some log messages also. + * + * Revision 1.46 1997/02/10 10:20:13 adam + * Flag fileVerboseFlag set to 0 (default). + * + * Revision 1.45 1996/11/08 11:10:26 adam + * Buffers used during file match got bigger. + * Compressed ISAM support everywhere. + * Bug fixes regarding masking characters in queries. + * Redesigned Regexp-2 queries. + * + * Revision 1.44 1996/10/29 14:09:48 adam + * Use of cisam system - enabled if setting isamc is 1. + * + * Revision 1.43 1996/06/06 12:08:42 quinn + * Added showRecord function + * + * Revision 1.42 1996/05/31 09:07:01 quinn + * Work on character-set handling + * + * Revision 1.41 1996/05/14 14:04:34 adam + * In zebraidx, the 'stat' command is improved. Statistics about ISAM/DICT + * is collected. + * + * Revision 1.40 1996/04/26 10:00:23 adam + * Added option -V to zebraidx to display version information. + * Removed stupid warnings from file update. + * + * Revision 1.39 1996/04/09 10:05:21 adam + * Bug fix: prev_name buffer possibly too small; allocated in key_file_init. + * + * Revision 1.38 1996/03/26 16:01:14 adam + * New setting lockPath: directory of various lock files. + * + * Revision 1.37 1996/03/19 12:43:26 adam * Bug fix: File update traversal didn't handle trailing slashes correctly. * Bug fix: Update of sub directory groups wasn't handled correctly. * @@ -140,15 +180,17 @@ */ #include #include +#ifdef WINDOWS +#include +#else #include +#endif -#include #include #include "index.h" char *prog; -size_t mem_max = 4*1024*1024; -extern char *data1_tabpath; +size_t mem_max = 0; static void abort_func (int level, const char *msg, void *info) { @@ -174,7 +216,8 @@ int main (int argc, char **argv) rGroupDef.recordType = NULL; rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; - rGroupDef.fileVerboseFlag = 1; + rGroupDef.flagShowRecords = 0; + rGroupDef.fileVerboseLimit = 100000; prog = *argv; if (argc < 2) @@ -192,12 +235,15 @@ int main (int argc, char **argv) " -g Index files according to group settings.\n" " -d Records belong to Z39.50 database .\n" " -m Use before flushing keys to disk.\n" - " -n Don't use shadow system\n" - " -v Set logging to .\n"); + " -n Don't use shadow system.\n" + " -s Show analysis on stdout, but do no work.\n" + " -v Set logging to .\n" + " -f Display information for the first records.\n" + " -V Show version.\n" + ); exit (1); } - log_event_end (abort_func, NULL); - while ((ret = options ("t:c:g:d:m:v:n", argv, argc, &arg)) != -2) + while ((ret = options ("sVt:c:g:d:m:v:nf:", argv, argc, &arg)) != -2) { if (ret == 0) { @@ -206,18 +252,27 @@ int main (int argc, char **argv) { if (!common_resource) { + logf (LOG_LOG, "zebra version %s %s", + ZEBRAVER, ZEBRADATE); common_resource = res_open (configName ? configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "Cannot open resource `%s'", + logf (LOG_FATAL, "cannot open resource `%s'", configName); exit (1); } - data1_tabpath = res_get (common_resource, "profilePath"); + data1_set_tabpath (res_get (common_resource, + "profilePath")); + bf_lockDir (res_get (common_resource, "lockDir")); + init_charmap(); } if (!strcmp (arg, "update")) cmd = 'u'; + else if (!strcmp (arg, "update1")) + cmd = 'U'; + else if (!strcmp (arg, "update2")) + cmd = 'm'; else if (!strcmp (arg, "dump")) cmd = 's'; else if (!strcmp (arg, "del") || !strcmp(arg, "delete")) @@ -236,19 +291,19 @@ int main (int argc, char **argv) } if (bf_commitExists ()) { - logf (LOG_LOG, "Commit start"); + logf (LOG_LOG, "commit start"); zebraIndexLockMsg ("c"); zebraIndexWait (1); - logf (LOG_LOG, "Commit execute"); + logf (LOG_LOG, "commit execute"); bf_commitExec (); sync (); zebraIndexLockMsg ("d"); zebraIndexWait (0); - logf (LOG_LOG, "Commit clean"); + logf (LOG_LOG, "commit clean"); bf_commitClean (); } else - logf (LOG_LOG, "Nothing to commit"); + logf (LOG_LOG, "cothing to commit"); } else if (!strcmp (arg, "clean")) { @@ -257,11 +312,11 @@ int main (int argc, char **argv) { zebraIndexLockMsg ("d"); zebraIndexWait (0); - logf (LOG_LOG, "Commit clean"); + logf (LOG_LOG, "commit clean"); bf_commitClean (); } else - logf (LOG_LOG, "Nothing to clean"); + logf (LOG_LOG, "nothing to clean"); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { @@ -273,10 +328,11 @@ int main (int argc, char **argv) zebraIndexLockMsg ("r"); } rec_prstat (); + inv_prstat (); } else { - logf (LOG_FATAL, "Unknown command: %s", arg); + logf (LOG_FATAL, "unknown command: %s", arg); exit (1); } } @@ -284,6 +340,7 @@ int main (int argc, char **argv) { struct recordGroup rGroup; + log_event_end (abort_func, NULL); zebraIndexLock (0); rval = res_get (common_resource, "shadow"); if (rval && *rval && !disableCommit) @@ -297,53 +354,67 @@ int main (int argc, char **argv) zebraIndexLockMsg ("w"); } zebraIndexWait (0); - + memcpy (&rGroup, &rGroupDef, sizeof(rGroup)); - key_open (mem_max); rGroup.path = arg; - if (cmd == 'u') + switch (cmd) { - logf (LOG_LOG, "Updating %s", rGroup.path); + case 'u': + key_open (mem_max); + logf (LOG_LOG, "updating %s", rGroup.path); repositoryUpdate (&rGroup); - } - else if (cmd == 'd') - { - logf (LOG_LOG, "Deleting %s", rGroup.path); + nsections = key_close (); + break; + case 'U': + key_open (mem_max); + logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); + repositoryUpdate (&rGroup); + key_close (); + nsections = 0; + break; + case 'd': + key_open (mem_max); + logf (LOG_LOG, "deleting %s", rGroup.path); repositoryDelete (&rGroup); - } - else if (cmd == 's') - { - logf (LOG_LOG, "Dumping %s", rGroup.path); + nsections = key_close (); + break; + case 's': + logf (LOG_LOG, "dumping %s", rGroup.path); repositoryShow (&rGroup); + nsections = 0; + break; + case 'm': + nsections = -1; + break; + default: + nsections = 0; } - cmd = 0; - nsections = key_close (); if (nsections) { - logf (LOG_LOG, "Merging with index"); - key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, - 60); + logf (LOG_LOG, "merging with index"); + key_input (nsections, 60); sync (); } + log_event_end (NULL, NULL); } } - else if (ret == 'v') + else if (ret == 'V') { - log_init (log_mask_str(arg), prog, NULL); + fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); } + else if (ret == 'v') + log_init (log_mask_str(arg), prog, NULL); else if (ret == 'm') - { mem_max = 1024*1024*atoi(arg); - } else if (ret == 'd') - { rGroupDef.databaseName = arg; - } + else if (ret == 's') + rGroupDef.flagShowRecords = 1; else if (ret == 'g') - { rGroupDef.groupName = arg; - } + else if (ret == 'f') + rGroupDef.fileVerboseLimit = atoi(arg); else if (ret == 'c') configName = arg; else if (ret == 't') @@ -352,7 +423,7 @@ int main (int argc, char **argv) disableCommit = 1; else { - logf (LOG_FATAL, "Unknown option '-%s'", arg); + logf (LOG_FATAL, "unknown option '-%s'", arg); exit (1); } }