X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=553e280e83d4a56e99e8ec8ea41aeda9211107ad;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=140ef986b99847cf1c3d7950ff7a504eb787704e;hpb=162fa86044b5aa303c03fa26f1ecf140b34060d5;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 140ef98..553e280 100644 --- a/index/main.c +++ b/index/main.c @@ -4,7 +4,42 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.22 1995-11-28 09:09:42 adam + * 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. + * + * Revision 1.27 1995/12/07 17:38:47 adam + * Work locking mechanisms for concurrent updates/commit. + * + * Revision 1.26 1995/12/06 12:41:23 adam + * New command 'stat' for the index program. + * Filenames can be read from stdin by specifying '-'. + * Bug fix/enhancement of the transformation from terms to regular + * expressons in the search engine. + * + * Revision 1.25 1995/12/01 16:24:39 adam + * Commit files use separate meta file area. + * + * Revision 1.24 1995/11/30 17:01:38 adam + * New setting commitCache: points to commit directories/files. + * New command commit: commits at the end of a zebraidx run. + * + * Revision 1.23 1995/11/30 08:34:31 adam + * Started work on commit facility. + * Changed a few malloc/free to xmalloc/xfree. + * + * Revision 1.22 1995/11/28 09:09:42 adam * Zebra config renamed. * Use setting 'recordId' to identify record now. * Bug fix in recindex.c: rec_release_blocks was invokeded even @@ -98,7 +133,7 @@ int main (int argc, char **argv) char *arg; char *configName = NULL; int nsections; - int key_open_flag = 0; + int disableCommit = 0; struct recordGroup rGroupDef; @@ -113,20 +148,85 @@ int main (int argc, char **argv) prog = *argv; if (argc < 2) { - fprintf (stderr, "index [-v log] [-m meg] [-c config] [-d base]" - " [-g group] [update|del dir] ...\n"); + fprintf (stderr, "zebraidx [options] command ...\n" + "Commands:\n" + " 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" + "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" + " -n Don't use commit system\n" + " -v Set logging to .\n"); exit (1); } - while ((ret = options ("t:c:g:v:m:d:", argv, argc, &arg)) != -2) + while ((ret = options ("t:c:g:d:m:v:n", argv, argc, &arg)) != -2) { if (ret == 0) { + const char *rval; if(cmd == 0) /* command */ { + if (!common_resource) + { + common_resource = res_open (configName ? + configName : FNAME_CONFIG); + if (!common_resource) + { + logf (LOG_FATAL, "Cannot open resource `%s'", + configName); + exit (1); + } + data1_tabpath = res_get (common_resource, "profilePath"); + } if (!strcmp (arg, "update")) cmd = 'u'; else if (!strcmp (arg, "del") || !strcmp(arg, "delete")) cmd = 'd'; + else if (!strcmp (arg, "commit")) + { + zebraIndexLock (1); + rval = res_get (common_resource, "commit"); + if (rval && *rval) + bf_cache (1); + else + { + logf (LOG_FATAL, "Cannot perform commit"); + logf (LOG_FATAL, "No commit area defined " + "in the configuration file"); + exit (1); + } + if (bf_commitExists ()) + { + logf (LOG_LOG, "Commit start"); + zebraIndexLockMsg ("c"); + zebraIndexWait (1); + logf (LOG_LOG, "Commit execute"); + bf_commitExec (); + sync (); + zebraIndexLockMsg ("d"); + zebraIndexWait (0); + logf (LOG_LOG, "Commit clean"); + bf_commitClean (); + } + else + logf (LOG_LOG, "Nothing to commit"); + } + else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) + { + zebraIndexLock (0); + rval = res_get (common_resource, "commit"); + if (rval && *rval) + { + bf_cache (1); + zebraIndexLockMsg ("r"); + } + rec_prstat (); + } else { logf (LOG_FATAL, "Unknown command: %s", arg); @@ -137,31 +237,42 @@ int main (int argc, char **argv) { struct recordGroup rGroup; - memcpy (&rGroup, &rGroupDef, sizeof(rGroup)); - if (!common_resource) + zebraIndexLock (0); + rval = res_get (common_resource, "commit"); + if (rval && *rval && !disableCommit) { - common_resource = res_open (configName ? - configName : FNAME_CONFIG); - if (!common_resource) - { - logf (LOG_FATAL, "Cannot open resource `%s'", - configName); - exit (1); - } - data1_tabpath = res_get (common_resource, "profilePath"); - assert (data1_tabpath); + bf_cache (1); + zebraIndexLockMsg ("r"); } - if (!key_open_flag) + else { - key_open (mem_max); - key_open_flag = 1; + bf_cache (0); + zebraIndexLockMsg ("w"); } + zebraIndexWait (0); + + memcpy (&rGroup, &rGroupDef, sizeof(rGroup)); + key_open (mem_max); rGroup.path = arg; if (cmd == 'u') + { + logf (LOG_LOG, "Updating %s", rGroup.path); repositoryUpdate (&rGroup); + } else if (cmd == 'd') + { + logf (LOG_LOG, "Deleting %s", rGroup.path); repositoryDelete (&rGroup); + } cmd = 0; + nsections = key_close (); + if (nsections) + { + logf (LOG_LOG, "Merging with index"); + key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, + 60); + sync (); + } } } else if (ret == 'v') @@ -184,19 +295,15 @@ 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); } } - if (!key_open_flag) - exit (0); - nsections = key_close (); - if (!nsections) - exit (0); - logf (LOG_LOG, "Merging with index"); - key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60); + zebraIndexUnlock (); exit (0); }