X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=51b475e8a575fe900e6d80613d1426c4b44318c9;hb=869b11178c518bf4b8c81e1cb5daca8cfc8a17c6;hp=ae3095e2337e020b7eb1ac66ef4150ff6d8ebadf;hpb=366f5c2889c8bccb1f645aebf737b6082f200da5;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index ae3095e..51b475e 100644 --- a/index/main.c +++ b/index/main.c @@ -4,7 +4,69 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.19 1995-11-25 10:24:06 adam + * 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. + * + * 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 + * though the blocks were already released. + * File traversal properly deletes records when needed. + * + * Revision 1.21 1995/11/27 14:27:39 adam + * Renamed 'update' command to 'dir'. + * + * Revision 1.20 1995/11/27 13:58:53 adam + * New option -t. storeStore data implemented in server. + * + * Revision 1.19 1995/11/25 10:24:06 adam * More record fields - they are enumerated now. * New options: flagStoreData flagStoreKey. * @@ -78,6 +140,12 @@ char *prog; size_t mem_max = 4*1024*1024; extern char *data1_tabpath; +static void abort_func (int level, const char *msg, void *info) +{ + if (level & LOG_FATAL) + abort (); +} + int main (int argc, char **argv) { int ret; @@ -85,41 +153,113 @@ int main (int argc, char **argv) char *arg; char *configName = NULL; int nsections; - int key_open_flag = 0; + int disableCommit = 0; - struct recordGroup rGroup; + struct recordGroup rGroupDef; - rGroup.groupName = NULL; - rGroup.databaseName = NULL; - rGroup.path = NULL; - rGroup.fileMatch = NULL; - rGroup.flagStoreData = -1; - rGroup.flagStoreKeys = -1; + rGroupDef.groupName = NULL; + rGroupDef.databaseName = NULL; + rGroupDef.path = NULL; + rGroupDef.recordId = NULL; + rGroupDef.recordType = NULL; + rGroupDef.flagStoreData = -1; + rGroupDef.flagStoreKeys = -1; prog = *argv; if (argc < 2) { - fprintf (stderr, "index [-v log] [-m meg] [-c config] [-d base]" - " [-g group] cmd1 dir1 cmd2 dir2 ...\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" + " 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" + " -n Don't use shadow system\n" + " -v Set logging to .\n"); exit (1); } - while ((ret = options ("c:g:v:m:d:", argv, argc, &arg)) != -2) + log_event_end (abort_func, NULL); + 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 (!strcmp (arg, "add")) + if (!common_resource) { - cmd = 'a'; + 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"); } - else if (!strcmp (arg, "del")) - { + 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, "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"); + 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, "update")) + else if (!strcmp (arg, "clean")) { - cmd = 'u'; + zebraIndexLock (0); + 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, "stat") || !strcmp (arg, "status")) + { + zebraIndexLock (0); + rval = res_get (common_resource, "shadow"); + if (rval && *rval) + { + bf_cache (1); + zebraIndexLockMsg ("r"); + } + rec_prstat (); } else { @@ -129,32 +269,44 @@ int main (int argc, char **argv) } else { - if (!common_resource) + struct recordGroup rGroup; + + zebraIndexLock (0); + rval = res_get (common_resource, "shadow"); + if (rval && *rval && !disableCommit) { - common_resource = res_open (configName ? - configName : "base"); - if (!common_resource) - { - logf (LOG_FATAL, "Cannot open resource `%s'", - configName); - exit (1); - } - data1_tabpath = res_get (common_resource, "data1_tabpath"); - 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 == 'a') - repositoryAdd (&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') @@ -167,27 +319,26 @@ int main (int argc, char **argv) } else if (ret == 'd') { - rGroup.databaseName = arg; + rGroupDef.databaseName = arg; } else if (ret == 'g') { - rGroup.groupName = arg; + rGroupDef.groupName = arg; } else if (ret == 'c') 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, "Input"); - key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60); + if (common_resource) + zebraIndexUnlock (); exit (0); }