X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fmain.c;h=f7cb72ba96c4d44f55c671f60e9e657c518a2a98;hb=7905afa0cdbee2d751d058bda53919746361dda2;hp=1650899d341ce24395555ed3a711035fc3a50484;hpb=9f9b9eeb79d92c7793ffaba8805537bd401bdfbe;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 1650899..f7cb72b 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,109 @@ /* - * 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.17 1995-11-21 15:01:16 adam + * 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. + * + * 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. + * + * 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 * New general match criteria implemented. * New feature: document groups. * @@ -71,6 +170,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; @@ -78,38 +183,127 @@ 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; + rGroupDef.groupName = NULL; + rGroupDef.databaseName = NULL; + rGroupDef.path = NULL; + rGroupDef.recordId = NULL; + rGroupDef.recordType = NULL; + rGroupDef.flagStoreData = -1; + rGroupDef.flagStoreKeys = -1; + rGroupDef.flagShowRecords = 0; + rGroupDef.fileVerboseFlag = 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