X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=97ac380aa327d0d4e0a92ec9d8896c526d701470;hb=35590968609f84a4ac4f4965c7b359cf06640491;hp=149c9c8fc900a74b3065cddebd8059518dc0c604;hpb=48d26dcea283f57c49f77b82d6a987e41d775749;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 149c9c8..97ac380 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,16 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.58 1998-06-08 14:43:13 adam + * 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. @@ -229,6 +235,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; @@ -247,6 +261,9 @@ int main (int argc, char **argv) nmem_init (); +#if ZEBRASDR + zebraSdr_std (); +#endif rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; rGroupDef.path = NULL; @@ -260,6 +277,8 @@ int main (int argc, char **argv) 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) @@ -285,7 +304,7 @@ int main (int argc, char **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:", argv, argc, &arg)) != -2) { if (ret == 0) { @@ -466,7 +485,9 @@ int main (int argc, char **argv) fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, 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')