X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fmain.c;h=0c9cad865d277760774e01b9246c98fadb8065c7;hp=5375e097fdeb392785a8a4c3227657e1f270a09d;hb=795af4e3c7346eff351ff387228ec548956eada8;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c diff --git a/index/main.c b/index/main.c index 5375e09..0c9cad8 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,153 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.27 1995-12-07 17:38:47 adam + * Revision 1.66 1999-06-25 13:48:02 adam + * Updated MSVC project files. + * Added BZIP2 record compression (not very well tested). + * + * Revision 1.65 1999/05/20 12:57:18 adam + * Implemented TCL filter. Updated recctrl system. + * + * Revision 1.64 1999/05/15 14:36:38 adam + * Updated dictionary. Implemented "compression" of dictionary. + * + * Revision 1.63 1999/03/09 16:27:49 adam + * More work on SDRKit integration. + * + * Revision 1.62 1999/02/18 15:01:24 adam + * Minor changes. + * + * Revision 1.61 1999/02/02 14:51:00 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.60 1998/10/28 10:54:39 adam + * SDRKit integration. + * + * Revision 1.59 1998/10/16 08:14:32 adam + * Updated record control system. + * + * Revision 1.58 1998/06/08 14:43:13 adam + * Added suport for EXPLAIN Proxy servers - added settings databasePath + * and explainDatabase to facilitate this. Increased maximum number + * of databases and attributes in one register. + * + * Revision 1.57 1998/05/20 10:12:18 adam + * Implemented automatic EXPLAIN database maintenance. + * Modified Zebra to work with ASN.1 compiled version of YAZ. + * + * Revision 1.56 1998/03/05 08:45:12 adam + * New result set model and modular ranking system. Moved towards + * descent server API. System information stored as "SGML" records. + * + * Revision 1.55 1998/01/26 10:37:34 adam + * Minor changes. + * + * Revision 1.54 1998/01/12 15:04:08 adam + * The test option (-s) only uses read-lock (and not write lock). + * + * Revision 1.53 1997/11/18 10:05:08 adam + * Changed character map facility so that admin can specify character + * mapping files for each register type, w, p, etc. + * + * Revision 1.52 1997/10/31 12:34:04 adam + * Added missing nmem_init. + * + * Revision 1.51 1997/10/27 14:33:05 adam + * Moved towards generic character mapping depending on "structure" + * field in abstract syntax file. Fixed a few memory leaks. Fixed + * bug with negative integers when doing searches with relational + * operators. + * + * Revision 1.50 1997/09/25 14:55:52 adam + * Minor changes. + * + * Revision 1.49 1997/09/17 12:19:15 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.48 1997/09/09 13:38:08 adam + * Partial port to WIN95/NT. + * + * Revision 1.47 1997/02/12 20:39:46 adam + * Implemented options -f that limits the log to the first + * records. + * Changed some log messages also. + * + * Revision 1.46 1997/02/10 10:20:13 adam + * Flag fileVerboseFlag set to 0 (default). + * + * 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. + * + * 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 @@ -101,15 +244,27 @@ */ #include #include +#ifdef WIN32 +#include +#else #include +#endif -#include #include #include "index.h" +#include "recindex.h" + +#ifndef ZEBRASDR +#define ZEBRASDR 0 +#endif + +#if ZEBRASDR +#include "zebrasdr.h" +#endif char *prog; -size_t mem_max = 4*1024*1024; -extern char *data1_tabpath; + +Res common_resource = 0; int main (int argc, char **argv) { @@ -118,9 +273,17 @@ int main (int argc, char **argv) char *arg; char *configName = NULL; int nsections; + int disableCommit = 0; + size_t mem_max = 0; struct recordGroup rGroupDef; - + + nmem_init (); + +#if ZEBRASDR + zebraSdr_std (); + rGroupDef.useSDR = 0; +#endif rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; rGroupDef.path = NULL; @@ -128,6 +291,14 @@ int main (int argc, char **argv) rGroupDef.recordType = NULL; rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; + rGroupDef.flagRw = 1; + rGroupDef.databaseNamePath = 0; + rGroupDef.explainDatabase = 0; + rGroupDef.fileVerboseLimit = 100000; + rGroupDef.zebra_maps = NULL; + rGroupDef.dh = data1_create (); + rGroupDef.recTypes = recTypes_init (rGroupDef.dh); + recTypes_default_handlers (rGroupDef.recTypes); prog = *argv; if (argc < 2) @@ -137,118 +308,261 @@ 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" + " -l Write log to .\n" + " -f Display information for the first records.\n" +#if ZEBRASDR + " -S Use SDRKit\n" +#endif + " -V Show version.\n" + ); exit (1); } - while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2) + while ((ret = options ("sVt:c:g:d:m:v:nf:l:" +#if ZEBRASDR + "S" +#endif + , argv, argc, &arg)) != -2) { if (ret == 0) { + const char *rval; if(cmd == 0) /* command */ { if (!common_resource) { - const char *rval; + logf (LOG_LOG, "zebra version %s %s", + ZEBRAVER, ZEBRADATE); common_resource = res_open (configName ? configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "Cannot open resource `%s'", + logf (LOG_FATAL, "cannot configuration file `%s'", configName); exit (1); } - data1_tabpath = res_get (common_resource, "profilePath"); - rval = res_get (common_resource, "commitEnable"); + data1_set_tabpath (rGroupDef.dh, res_get (common_resource, + "profilePath")); - zebraIndexLock (1); - if (rval && atoi(rval)) - { - zebraIndexLockMsg ("r"); - bf_cache (); - } - else - zebraIndexLockMsg ("w"); + rGroupDef.bfs = + bfs_create (res_get (common_resource, "register")); + + bf_lockDir (rGroupDef.bfs, + res_get (common_resource, "lockDir")); + rGroupDef.zebra_maps = zebra_maps_open (common_resource); } 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")) { - logf (LOG_LOG, "Commit"); - zebraIndexLockMsg ("c"); - bf_commit (); + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 1, rval); + if (rval && *rval) + bf_cache (rGroupDef.bfs, rval); + else + { + logf (LOG_FATAL, "Cannot perform commit"); + logf (LOG_FATAL, "No shadow area defined"); + exit (1); + } + if (bf_commitExists (rGroupDef.bfs)) + { + logf (LOG_LOG, "commit start"); + zebraIndexLockMsg ("c"); + zebraIndexWait (1); + logf (LOG_LOG, "commit execute"); + bf_commitExec (rGroupDef.bfs); +#ifndef WIN32 + sync (); +#endif + zebraIndexLockMsg ("d"); + zebraIndexWait (0); + logf (LOG_LOG, "commit clean"); + bf_commitClean (rGroupDef.bfs, rval); + } + else + logf (LOG_LOG, "cothing to commit"); + } + else if (!strcmp (arg, "clean")) + { + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 1, rval); + if (bf_commitExists (rGroupDef.bfs)) + { + zebraIndexLockMsg ("d"); + zebraIndexWait (0); + logf (LOG_LOG, "commit clean"); + bf_commitClean (rGroupDef.bfs, rval); + } + else + logf (LOG_LOG, "nothing to clean"); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - rec_prstat (); + Records records; + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 0, rval); + if (rval && *rval) + { + bf_cache (rGroupDef.bfs, rval); + zebraIndexLockMsg ("r"); + } + records = rec_open (rGroupDef.bfs, 0); + rec_prstat (records); + rec_close (&records); + inv_prstat (rGroupDef.bfs); + } + else if (!strcmp (arg, "compact")) + { + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 0, rval); + if (rval && *rval) + { + bf_cache (rGroupDef.bfs, rval); + zebraIndexLockMsg ("r"); + } + inv_compact(rGroupDef.bfs); } else { - logf (LOG_FATAL, "Unknown command: %s", arg); + logf (LOG_FATAL, "unknown command: %s", arg); exit (1); } } - else + else { struct recordGroup rGroup; + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 0, rval); + if (rGroupDef.flagRw) + { + if (rval && *rval && !disableCommit) + { + bf_cache (rGroupDef.bfs, rval); + zebraIndexLockMsg ("r"); + } + else + { + bf_cache (rGroupDef.bfs, 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') + switch (cmd) { - logf (LOG_LOG, "Deleting %s", rGroup.path); - repositoryDelete (&rGroup); + case 'u': + if (!key_open (&rGroup, mem_max)) + { + logf (LOG_LOG, "updating %s", rGroup.path); + repositoryUpdate (&rGroup); + nsections = key_close (&rGroup); + } + break; + case 'U': + if (!key_open (&rGroup, mem_max)) + { + logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); + repositoryUpdate (&rGroup); + key_close (&rGroup); + } + nsections = 0; + break; + case 'd': + if (!key_open (&rGroup,mem_max)) + { + logf (LOG_LOG, "deleting %s", rGroup.path); + repositoryDelete (&rGroup); + nsections = key_close (&rGroup); + } + 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); + logf (LOG_LOG, "merging with index"); + key_input (rGroup.bfs, nsections, 60); +#ifndef WIN32 + sync (); +#endif } + log_event_end (NULL, NULL); } } - else if (ret == 'v') + else if (ret == 'V') { - log_init (log_mask_str(arg), prog, NULL); + fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); + fprintf (stderr, " (C) 1994-1999, Index Data ApS\n"); +#if HAVE_BZLIB_H + fprintf (stderr, "libbzip2\n" + " (C) 1996-1998 Julian R Seward. All rights reserved.\n"); +#endif } + else if (ret == 'v') + log_init_level (log_mask_str(arg)); + else if (ret == 'l') + log_init_file (arg); else if (ret == 'm') - { mem_max = 1024*1024*atoi(arg); - } else if (ret == 'd') - { rGroupDef.databaseName = arg; - } + else if (ret == 's') + rGroupDef.flagRw = 0; else if (ret == 'g') - { rGroupDef.groupName = arg; - } + else if (ret == 'f') + rGroupDef.fileVerboseLimit = atoi(arg); else if (ret == 'c') configName = arg; else if (ret == 't') rGroupDef.recordType = arg; + else if (ret == 'n') + disableCommit = 1; +#if ZEBRASDR + else if (ret == 'S') + rGroupDef.useSDR = 1; +#endif else - { - logf (LOG_FATAL, "Unknown option '-%s'", arg); - exit (1); - } + logf (LOG_WARN, "unknown option '-%s'", arg); + } + recTypes_destroy (rGroupDef.recTypes); + if (common_resource) + { + zebraIndexUnlock (); + bfs_destroy (rGroupDef.bfs); } - zebraIndexUnlock (1); + data1_destroy (rGroupDef.dh); exit (0); + return 0; }