X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=4ab1ebfd859fa48f2bfb004146579972aedb35eb;hb=a17b23c8615d81523afa6d124d2f91e237f06605;hp=04f332be63ea9708eef33bba3736acc985a27903;hpb=f3425fb457792aae865096cf9acf5cb41798b1d1;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 04f332b..4ab1ebf 100644 --- a/index/main.c +++ b/index/main.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.67 1999-07-06 12:28:04 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. * @@ -275,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; @@ -351,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, @@ -360,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")); @@ -527,9 +547,16 @@ int main (int argc, char **argv) { 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-1998 Julian R Seward. All rights reserved.\n"); + " (C) 1996-1999 Julian R Seward. All rights reserved.\n"); #endif } else if (ret == 'v')