X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=ef92bb6c5b7f732559b6cb8bdb26d8f50f5d2d32;hb=4ed5fbcd29d2a98b048d1d94510b262d352b4f7c;hp=f6228349e792837df863f13df91f66231585f8b5;hpb=ce3907338568fce46c5751e7e1091a5ad1c8e291;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index f622834..ef92bb6 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,37 @@ /* - * 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.56 1998-03-05 08:45:12 adam + * 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. * @@ -210,7 +237,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -220,6 +247,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; @@ -238,6 +273,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; @@ -246,9 +285,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) @@ -269,12 +312,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) { @@ -332,7 +383,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"); @@ -372,6 +423,17 @@ int main (int argc, char **argv) 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); @@ -403,31 +465,28 @@ int main (int argc, char **argv) switch (cmd) { case 'u': - if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw, - rGroup.dh)) + if (!key_open (&rGroup, mem_max)) { logf (LOG_LOG, "updating %s", rGroup.path); repositoryUpdate (&rGroup); - nsections = key_close (rGroup.flagRw); + nsections = key_close (&rGroup); } break; case 'U': - if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw, - rGroup.dh)) + if (!key_open (&rGroup, mem_max)) { logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); repositoryUpdate (&rGroup); - key_close (rGroup.flagRw); + key_close (&rGroup); } nsections = 0; break; case 'd': - if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw, - rGroup.dh)) + if (!key_open (&rGroup,mem_max)) { logf (LOG_LOG, "deleting %s", rGroup.path); repositoryDelete (&rGroup); - nsections = key_close (rGroup.flagRw); + nsections = key_close (&rGroup); } break; case 's': @@ -446,7 +505,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 } @@ -455,10 +514,18 @@ int main (int argc, char **argv) } else if (ret == 'V') { - fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); + fprintf (stderr, "Zebra %s %s\n", +#if ZEBRASDR + "SDR", +#else + ZEBRAVER, +#endif + ZEBRADATE); } 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') @@ -475,6 +542,10 @@ 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); }