X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=4ab1ebfd859fa48f2bfb004146579972aedb35eb;hb=285a986588deacac089734552a7149142f7afc7d;hp=97ac380aa327d0d4e0a92ec9d8896c526d701470;hpb=e6c873a1bf7291b89cfcfe76184c4154c61056e1;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 97ac380..4ab1ebf 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,49 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.60 1998-10-28 10:54:39 adam + * 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 @@ -225,7 +264,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -252,8 +291,8 @@ 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; @@ -263,6 +302,7 @@ int main (int argc, char **argv) #if ZEBRASDR zebraSdr_std (); + rGroupDef.useSDR = 0; #endif rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; @@ -299,12 +339,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:l:", 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) { @@ -319,8 +367,7 @@ int main (int argc, char **argv) configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "cannot configuration file `%s'", - configName); + logf (LOG_FATAL, "cannot read file `%s'", configName); exit (1); } data1_set_tabpath (rGroupDef.dh, res_get (common_resource, @@ -328,6 +375,11 @@ 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")); @@ -362,7 +414,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"); @@ -397,11 +449,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); @@ -473,7 +536,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 } @@ -483,6 +546,18 @@ 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"); +#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_level (log_mask_str(arg)); @@ -504,9 +579,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 ();