X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=c2b16c194c981fa18af623cb18236420d9358b0e;hb=e5ebc859654d84aa9098142b34015648d8e333de;hp=4991924fe9ed44fdea73d2c17345787380d90b26;hpb=b9093505b17a074e79137ed64595c8269f77d330;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 4991924..c2b16c1 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,111 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.49 1997-09-17 12:19:15 adam + * Revision 1.78 2000-10-17 12:37:09 adam + * Fixed notification of live-updates. Fixed minor problem with mf_init + * where it didn't handle shadow area file names correctly. + * + * Revision 1.77 2000/09/05 14:04:05 adam + * Updates for prefix 'yaz_' for YAZ log functions. + * + * Revision 1.76 2000/03/20 19:08:36 adam + * Added remote record import using Z39.50 extended services and Segment + * Requests. + * + * Revision 1.75 1999/12/08 22:44:45 adam + * Zebra/Z'mbol dependencies added. + * + * Revision 1.74 1999/12/08 15:03:11 adam + * Implemented bf_reset. + * + * + * Revision 1.73 1999/11/30 13:48:03 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * Revision 1.72 1999/10/14 14:33:50 adam + * Added truncation 5=106. + * + * Revision 1.71 1999/09/08 12:12:06 adam + * Fixed bad message. + * + * Revision 1.70 1999/09/07 07:19:21 adam + * Work on character mapping. Implemented replace rules. + * + * Revision 1.69 1999/07/21 08:31:33 adam + * More version info on WIN32. + * + * 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. * @@ -184,37 +285,47 @@ */ #include #include -#ifdef WINDOWS +#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 = 0; Res common_resource = 0; -static void abort_func (int level, const char *msg, void *info) -{ - if (level & LOG_FATAL) - abort (); -} int main (int argc, char **argv) { int ret; int cmd = 0; char *arg; - char *configName = NULL; - int nsections; + char *configName = FNAME_CONFIG; + 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; @@ -222,14 +333,19 @@ 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) { - fprintf (stderr, "zebraidx [options] command ...\n" + fprintf (stderr, "%s [options] command ...\n" "Commands:\n" " update Update index with files below .\n" " If is empty filenames are read from stdin.\n" @@ -245,12 +361,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" - " -V Show version.\n" +#if ZEBRASDR + " -S Use SDRKit\n" +#endif + " -V Show version.\n", *argv ); 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) { @@ -259,14 +383,18 @@ int main (int argc, char **argv) { if (!common_resource) { +#if ZMBOL + logf (LOG_LOG, "zmbol version %s %s", + ZEBRAVER, ZEBRADATE); +#else logf (LOG_LOG, "zebra version %s %s", ZEBRAVER, ZEBRADATE); +#endif common_resource = res_open (configName ? configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "cannot open resource `%s'", - configName); + logf (LOG_FATAL, "cannot read file `%s'", configName); exit (1); } data1_set_tabpath (rGroupDef.dh, res_get (common_resource, @@ -274,10 +402,15 @@ int main (int argc, char **argv) rGroupDef.bfs = bfs_create (res_get (common_resource, "register")); + if (!rGroupDef.bfs) + { + logf (LOG_FATAL, "Cannot access register"); + exit(1); + } bf_lockDir (rGroupDef.bfs, res_get (common_resource, "lockDir")); - init_charmap(common_resource); + rGroupDef.zebra_maps = zebra_maps_open (common_resource); } if (!strcmp (arg, "update")) cmd = 'u'; @@ -289,6 +422,16 @@ int main (int argc, char **argv) cmd = 's'; else if (!strcmp (arg, "del") || !strcmp(arg, "delete")) cmd = 'd'; + else if (!strcmp (arg, "init")) + { + zebraIndexUnlock(); + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 0, rval); + if (rval && *rval) + bf_cache (rGroupDef.bfs, rval); + zebraIndexLockMsg ("w"); + bf_reset (rGroupDef.bfs); + } else if (!strcmp (arg, "commit")) { rval = res_get (common_resource, "shadow"); @@ -308,14 +451,16 @@ int main (int argc, char **argv) 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"); + logf (LOG_LOG, "nothing to commit"); } else if (!strcmp (arg, "clean")) { @@ -333,6 +478,7 @@ int main (int argc, char **argv) } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { + Records records; rval = res_get (common_resource, "shadow"); zebraIndexLock (rGroupDef.bfs, 0, rval); if (rval && *rval) @@ -340,56 +486,84 @@ int main (int argc, char **argv) bf_cache (rGroupDef.bfs, rval); zebraIndexLockMsg ("r"); } - rec_prstat (); + 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 (rGroupDef.bfs, rval); + zebraIndexLockMsg ("r"); + } + inv_compact(rGroupDef.bfs); + } else { logf (LOG_FATAL, "unknown command: %s", arg); exit (1); } } - else + else { struct recordGroup rGroup; - - log_event_end (abort_func, NULL); +#if ZMBOL +#else + /* For zebra, delete lock file and reset register */ + if (rGroupDef.flagRw) + { + zebraIndexUnlock(); + bf_reset (rGroupDef.bfs); + } +#endif rval = res_get (common_resource, "shadow"); zebraIndexLock (rGroupDef.bfs, 0, rval); - if (rval && *rval && !disableCommit) - { - bf_cache (rGroupDef.bfs, rval); - zebraIndexLockMsg ("r"); - } - else - { - bf_cache (rGroupDef.bfs, 0); - zebraIndexLockMsg ("w"); - } - zebraIndexWait (0); - + 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 (rGroup.bfs, 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 (rGroup.bfs,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 (rGroup.bfs,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); @@ -406,24 +580,44 @@ int main (int argc, char **argv) if (nsections) { logf (LOG_LOG, "merging with index"); - key_input (rGroup.bfs, nsections, 60); + key_input (rGroup.bfs, nsections, 60, common_resource); +#ifndef WIN32 sync (); +#endif } log_event_end (NULL, NULL); } } else if (ret == 'V') { +#if ZMBOL + fprintf (stderr, "Z'mbol %s %s\n", ZEBRAVER, ZEBRADATE); +#else fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); +#endif + fprintf (stderr, " (C) 1994-1999, Index Data ApS\n"); +#ifdef WIN32 +#ifdef _DEBUG + fprintf (stderr, " WIN32 Debug\n"); +#else + fprintf (stderr, " WIN32 Release\n"); +#endif +#endif +#if HAVE_BZLIB_H + fprintf (stderr, "libbzip2\n" + " (C) 1996-1999 Julian R Seward. All rights reserved.\n"); +#endif } else if (ret == 'v') - log_init (log_mask_str(arg), prog, NULL); + yaz_log_init_level (yaz_log_mask_str(arg)); + else if (ret == 'l') + yaz_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') @@ -434,12 +628,14 @@ 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 (); @@ -447,5 +643,6 @@ int main (int argc, char **argv) } data1_destroy (rGroupDef.dh); exit (0); + return 0; }