X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=6ca094613acec41d700186e9ed4c3d2c3cbc1727;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=d238bb9559c416276bd4326fd0dc5b80ee2cca4e;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index d238bb9..6ca0946 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,82 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.48 1997-09-09 13:38:08 adam + * Revision 1.68 1999-07-14 10:59:26 adam + * Changed functions isc_getmethod, isams_getmethod. + * Improved fatal error handling (such as missing EXPLAIN schema). + * + * Revision 1.67 1999/07/06 12:28:04 adam + * Updated record index structure. Format includes version ID. Compression + * algorithm ID is stored for each record block. + * + * 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 @@ -180,7 +252,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -188,15 +260,19 @@ #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 = 0; -static void abort_func (int level, const char *msg, void *info) -{ - if (level & LOG_FATAL) - abort (); -} +Res common_resource = 0; int main (int argc, char **argv) { @@ -204,11 +280,18 @@ int main (int argc, char **argv) int cmd = 0; char *arg; char *configName = NULL; - int nsections; + int nsections = 0; 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; @@ -216,8 +299,14 @@ int main (int argc, char **argv) rGroupDef.recordType = NULL; rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; - rGroupDef.flagShowRecords = 0; + 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) @@ -238,12 +327,20 @@ int main (int argc, char **argv) " -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 ("sVt:c:g:d:m:v:nf:", 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) { @@ -258,14 +355,19 @@ int main (int argc, char **argv) configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "cannot open resource `%s'", + logf (LOG_FATAL, "cannot configuration file `%s'", configName); exit (1); } - data1_set_tabpath (res_get (common_resource, - "profilePath")); - bf_lockDir (res_get (common_resource, "lockDir")); - init_charmap(); + data1_set_tabpath (rGroupDef.dh, res_get (common_resource, + "profilePath")); + + 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'; @@ -279,56 +381,73 @@ int main (int argc, char **argv) cmd = 'd'; else if (!strcmp (arg, "commit")) { - zebraIndexLock (1); rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 1, rval); if (rval && *rval) - bf_cache (1); + bf_cache (rGroupDef.bfs, rval); else { logf (LOG_FATAL, "Cannot perform commit"); logf (LOG_FATAL, "No shadow area defined"); exit (1); } - if (bf_commitExists ()) + if (bf_commitExists (rGroupDef.bfs)) { logf (LOG_LOG, "commit start"); zebraIndexLockMsg ("c"); zebraIndexWait (1); logf (LOG_LOG, "commit execute"); - bf_commitExec (); + bf_commitExec (rGroupDef.bfs); +#ifndef WIN32 sync (); +#endif zebraIndexLockMsg ("d"); zebraIndexWait (0); logf (LOG_LOG, "commit clean"); - bf_commitClean (); + bf_commitClean (rGroupDef.bfs, rval); } else logf (LOG_LOG, "cothing to commit"); } else if (!strcmp (arg, "clean")) { - zebraIndexLock (1); - if (bf_commitExists ()) + 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 (); + bf_commitClean (rGroupDef.bfs, rval); } else logf (LOG_LOG, "nothing to clean"); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - zebraIndexLock (0); + 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, 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 (1); + bf_cache (rGroupDef.bfs, rval); zebraIndexLockMsg ("r"); } - rec_prstat (); - inv_prstat (); + inv_compact(rGroupDef.bfs); } else { @@ -336,47 +455,54 @@ int main (int argc, char **argv) exit (1); } } - else + else { struct recordGroup rGroup; - log_event_end (abort_func, NULL); - zebraIndexLock (0); rval = res_get (common_resource, "shadow"); - if (rval && *rval && !disableCommit) - { - bf_cache (1); - zebraIndexLockMsg ("r"); - } - else - { - bf_cache (0); - zebraIndexLockMsg ("w"); - } - zebraIndexWait (0); - + 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)); rGroup.path = arg; switch (cmd) { case 'u': - key_open (mem_max); - logf (LOG_LOG, "updating %s", rGroup.path); - repositoryUpdate (&rGroup); - nsections = key_close (); + if (!key_open (&rGroup, mem_max)) + { + logf (LOG_LOG, "updating %s", rGroup.path); + repositoryUpdate (&rGroup); + nsections = key_close (&rGroup); + } break; case 'U': - key_open (mem_max); - logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); - repositoryUpdate (&rGroup); - key_close (); + 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': - key_open (mem_max); - logf (LOG_LOG, "deleting %s", rGroup.path); - repositoryDelete (&rGroup); - nsections = key_close (); + 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); @@ -393,8 +519,10 @@ int main (int argc, char **argv) if (nsections) { logf (LOG_LOG, "merging with index"); - key_input (nsections, 60); + key_input (rGroup.bfs, nsections, 60); +#ifndef WIN32 sync (); +#endif } log_event_end (NULL, NULL); } @@ -402,15 +530,22 @@ int main (int argc, char **argv) else if (ret == 'V') { 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 (log_mask_str(arg), prog, NULL); + 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.flagShowRecords = 1; + rGroupDef.flagRw = 0; else if (ret == 'g') rGroupDef.groupName = arg; else if (ret == 'f') @@ -421,14 +556,21 @@ int main (int argc, char **argv) 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); + } + data1_destroy (rGroupDef.dh); exit (0); + return 0; }