X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=574c212fe6d6f479bd4d2420d0dfb04fbe50a2fe;hb=d23f1adde49e76cfda218d7f50ba886c16d1a044;hp=8e68139d08dc55014672dc8bbe03bea17836b440;hpb=dd5f8f31bc5018a7b4a00accdda256ce1eaef14b;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 8e68139..574c212 100644 --- a/index/main.c +++ b/index/main.c @@ -4,7 +4,41 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.18 1995-11-22 17:19:17 adam + * 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. + * + * Revision 1.18 1995/11/22 17:19:17 adam * Record management uses the bfile system. * * Revision 1.17 1995/11/21 15:01:16 adam @@ -81,38 +115,68 @@ int main (int argc, char **argv) char *arg; char *configName = NULL; int nsections; - int key_open_flag = 0; - struct recordGroup rGroup; + struct recordGroup rGroupDef; - rGroup.groupName = NULL; - rGroup.databaseName = NULL; - rGroup.path = NULL; + 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" + "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"); exit (1); } - while ((ret = options ("c:g:v:m:d:", argv, argc, &arg)) != -2) + while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2) { if (ret == 0) { if(cmd == 0) /* command */ { - if (!strcmp (arg, "add")) + if (!common_resource) { - cmd = 'a'; + const char *rval; + 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"); + rval = res_get (common_resource, "commitEnable"); + if (rval && atoi(rval)) + bf_cache (); } - 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")) + { + logf (LOG_LOG, "Commit"); + bf_commit (); } - else if (!strcmp (arg, "update")) + else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - cmd = 'u'; + rec_prstat (); } else { @@ -122,32 +186,29 @@ int main (int argc, char **argv) } else { - if (!common_resource) - { - 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); - } - if (!key_open_flag) - { - key_open (mem_max); - key_open_flag = 1; - } + struct recordGroup rGroup; + + 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); + } } } else if (ret == 'v') @@ -160,27 +221,22 @@ 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 { 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); exit (0); }