X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=6ca094613acec41d700186e9ed4c3d2c3cbc1727;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=123887afe34873793b5f0be5ca567a76f37a120f;hpb=73d50b4eee5d1af8aae0ba0f0e7fed7ebad2dd51;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 123887a..6ca0946 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,56 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.55 1998-01-26 10:37:34 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 @@ -206,7 +252,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -216,6 +262,14 @@ #include "index.h" #include "recindex.h" +#ifndef ZEBRASDR +#define ZEBRASDR 0 +#endif + +#if ZEBRASDR +#include "zebrasdr.h" +#endif + char *prog; Res common_resource = 0; @@ -226,7 +280,7 @@ 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; @@ -234,6 +288,10 @@ int main (int argc, char **argv) nmem_init (); +#if ZEBRASDR + zebraSdr_std (); + rGroupDef.useSDR = 0; +#endif rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; rGroupDef.path = NULL; @@ -242,9 +300,13 @@ int main (int argc, char **argv) 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) @@ -265,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) { @@ -297,8 +367,7 @@ int main (int argc, char **argv) bf_lockDir (rGroupDef.bfs, res_get (common_resource, "lockDir")); - rGroupDef.zebra_maps = zebra_maps_open (res_get( - common_resource, "profilePath"), common_resource); + rGroupDef.zebra_maps = zebra_maps_open (common_resource); } if (!strcmp (arg, "update")) cmd = 'u'; @@ -329,7 +398,7 @@ int main (int argc, char **argv) zebraIndexWait (1); logf (LOG_LOG, "commit execute"); bf_commitExec (rGroupDef.bfs); -#ifndef WINDOWS +#ifndef WIN32 sync (); #endif zebraIndexLockMsg ("d"); @@ -364,11 +433,22 @@ int main (int argc, char **argv) bf_cache (rGroupDef.bfs, rval); zebraIndexLockMsg ("r"); } - records = rec_open (rGroupDef.bfs, 0); + 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); @@ -400,28 +480,28 @@ int main (int argc, char **argv) switch (cmd) { case 'u': - if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw)) + if (!key_open (&rGroup, mem_max)) { logf (LOG_LOG, "updating %s", rGroup.path); repositoryUpdate (&rGroup); - nsections = key_close (); + nsections = key_close (&rGroup); } break; case 'U': - if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw)) + if (!key_open (&rGroup, mem_max)) { logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); repositoryUpdate (&rGroup); - key_close (); + key_close (&rGroup); } nsections = 0; break; case 'd': - if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw)) + if (!key_open (&rGroup,mem_max)) { logf (LOG_LOG, "deleting %s", rGroup.path); repositoryDelete (&rGroup); - nsections = key_close (); + nsections = key_close (&rGroup); } break; case 's': @@ -440,7 +520,7 @@ int main (int argc, char **argv) { logf (LOG_LOG, "merging with index"); key_input (rGroup.bfs, nsections, 60); -#ifndef WINDOWS +#ifndef WIN32 sync (); #endif } @@ -450,9 +530,16 @@ 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') @@ -469,9 +556,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_WARN, "unknown option '-%s'", arg); } + recTypes_destroy (rGroupDef.recTypes); if (common_resource) { zebraIndexUnlock ();