X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=c586a29bc21ecdb435d3725121a99203edef37d1;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=f40cd03e4d14a35ae6500db349737e52b232f038;hpb=bf27228e5485151ee52bfd87dd91b025544ab6b2;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index f40cd03..c586a29 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,73 @@ /* - * 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.28 1995-12-08 16:22:56 adam + * 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. + * + * Revision 1.36 1996/02/12 18:45:37 adam + * New fileVerboseFlag in record group control. + * + * Revision 1.35 1996/02/12 15:56:11 adam + * New code command: unread. + * + * Revision 1.34 1996/02/07 14:06:39 adam + * Better progress report during register merge. + * New command: clean - removes temporary shadow files. + * + * Revision 1.33 1996/02/06 17:11:18 adam + * Minor changes. + * + * Revision 1.32 1996/02/01 20:50:04 adam + * Bug fix: zebraIndexUnlock was always called even though zebraIndexLock + * was never called - happens when no commands are specified. + * + * Revision 1.31 1996/01/08 19:15:46 adam + * New input filter that works! + * + * Revision 1.30 1995/12/12 16:00:59 adam + * System call sync(2) used after update/commit. + * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK + * and F_RDLCK. + * + * Revision 1.29 1995/12/11 11:43:30 adam + * Locking based on fcntl instead of flock. + * Setting commitEnable removed. Command line option -n can be used to + * prevent commit if commit setting is defined in the configuration file. + * + * Revision 1.28 1995/12/08 16:22:56 adam * Work on update while servers are running. Three lock files introduced. * The servers reload their registers when necessary, but they don't * reestablish result sets yet. @@ -108,13 +171,17 @@ #include #include -#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) +{ + if (level & LOG_FATAL) + abort (); +} int main (int argc, char **argv) { @@ -123,6 +190,7 @@ int main (int argc, char **argv) char *arg; char *configName = NULL; int nsections; + int disableCommit = 0; struct recordGroup rGroupDef; @@ -133,6 +201,8 @@ int main (int argc, char **argv) rGroupDef.recordType = NULL; rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; + rGroupDef.flagShowRecords = 0; + rGroupDef.fileVerboseFlag = 1; prog = *argv; if (argc < 2) @@ -142,16 +212,23 @@ 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" + " commit Commit changes\n" + " clean Clean shadow files\n" "Options:\n" " -t Index files as (grs or text).\n" " -c Read configuration file .\n" " -g Index files according to group settings.\n" " -d Records belong to Z39.50 database .\n" " -m Use before flushing keys to disk.\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" + " -V Show version\n" + ); exit (1); } - while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2) + log_event_end (abort_func, NULL); + while ((ret = options ("sVt:c:g:d:m:v:n", argv, argc, &arg)) != -2) { if (ret == 0) { @@ -168,19 +245,33 @@ int main (int argc, char **argv) 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")) cmd = 'd'; else if (!strcmp (arg, "commit")) { zebraIndexLock (1); - rval = res_get (common_resource, "commitEnable"); - if (rval && atoi (rval)) + rval = res_get (common_resource, "shadow"); + if (rval && *rval) bf_cache (1); - + else + { + logf (LOG_FATAL, "Cannot perform commit"); + logf (LOG_FATAL, "No shadow area defined"); + exit (1); + } if (bf_commitExists ()) { logf (LOG_LOG, "Commit start"); @@ -188,6 +279,7 @@ int main (int argc, char **argv) zebraIndexWait (1); logf (LOG_LOG, "Commit execute"); bf_commitExec (); + sync (); zebraIndexLockMsg ("d"); zebraIndexWait (0); logf (LOG_LOG, "Commit clean"); @@ -196,22 +288,30 @@ int main (int argc, char **argv) else logf (LOG_LOG, "Nothing to commit"); } - else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) + else if (!strcmp (arg, "clean")) { - zebraIndexLock (0); - bf_cache (0); - rec_prstat (); + zebraIndexLock (1); + if (bf_commitExists ()) + { + zebraIndexLockMsg ("d"); + zebraIndexWait (0); + logf (LOG_LOG, "Commit clean"); + bf_commitClean (); + } + else + logf (LOG_LOG, "Nothing to clean"); } - else if (!strcmp (arg, "cstat") || !strcmp (arg, "cstatus")) + else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - zebraIndexLock (1); - rval = res_get (common_resource, "commitEnable"); - if (rval && atoi(rval)) + zebraIndexLock (0); + rval = res_get (common_resource, "shadow"); + if (rval && *rval) { bf_cache (1); zebraIndexLockMsg ("r"); } rec_prstat (); + inv_prstat (); } else { @@ -224,39 +324,67 @@ int main (int argc, char **argv) struct recordGroup rGroup; zebraIndexLock (0); - rval = res_get (common_resource, "commitEnable"); - if (rval && atoi(rval)) + rval = res_get (common_resource, "shadow"); + if (rval && *rval && !disableCommit) { bf_cache (1); zebraIndexLockMsg ("r"); } else + { + bf_cache (0); zebraIndexLockMsg ("w"); + } zebraIndexWait (0); - + memcpy (&rGroup, &rGroupDef, sizeof(rGroup)); - key_open (mem_max); rGroup.path = arg; - if (cmd == 'u') + switch (cmd) { + case 'u': + key_open (mem_max); logf (LOG_LOG, "Updating %s", rGroup.path); repositoryUpdate (&rGroup); - } - else if (cmd == 'd') - { + 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); + 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); + key_input (nsections, 60); + sync (); } } } + else if (ret == 'V') + { + fprintf (stderr, "Zebra %s %s\n", + ZEBRAVER, ZEBRADATE); + } else if (ret == 'v') { log_init (log_mask_str(arg), prog, NULL); @@ -269,6 +397,10 @@ int main (int argc, char **argv) { rGroupDef.databaseName = arg; } + else if (ret == 's') + { + rGroupDef.flagShowRecords = 1; + } else if (ret == 'g') { rGroupDef.groupName = arg; @@ -277,13 +409,16 @@ int main (int argc, char **argv) configName = arg; else if (ret == 't') rGroupDef.recordType = arg; + else if (ret == 'n') + disableCommit = 1; else { logf (LOG_FATAL, "Unknown option '-%s'", arg); exit (1); } } - zebraIndexUnlock (); + if (common_resource) + zebraIndexUnlock (); exit (0); }