X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=e97ae7ce4371e8c7c68c42d3a94fedaf05280c3c;hb=f9da3895c7f972aa56c80eda5c1b463455042380;hp=149c9c8fc900a74b3065cddebd8059518dc0c604;hpb=48d26dcea283f57c49f77b82d6a987e41d775749;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 149c9c8..e97ae7c 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,31 @@
 /*
- * 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.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
+ * 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 +240,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -229,6 +250,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 +276,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;
@@ -260,6 +293,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 +315,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 <level>    Set logging to <level>.\n"
+        " -l <file>     Write log to <file>.\n"
         " -f <n>        Display information for the first <n> 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)
         {
@@ -343,7 +386,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");
@@ -383,6 +426,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);
@@ -454,7 +508,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
                 }
@@ -463,10 +517,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')
@@ -483,9 +545,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 ();