Minor changes.

[idzebra-moved-to-github.git] / index / main.c

diff --git a/index/main.c b/index/main.c
index 149c9c8..68e68a3 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,22 @@
 /*
- * 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.58  1998-06-08 14:43:13  adam
+ * 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.
@@ -219,7 +231,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -229,6 +241,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 +267,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 +283,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)
@@ -280,12 +305,13 @@ int main (int argc, char **argv)
         " -n            Don't use shadow system.\n"
        " -s            Show analysis on stdout, but do no work.\n"
        " -v <level>    Set logging to <level>.\n"
+        " -l <file>     Write log to <file>.\n"
         " -f <n>        Display information for the first <n> records.\n"
         " -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:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -343,7 +369,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");
@@ -454,7 +480,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
                 }
@@ -466,7 +492,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')