X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=6ca094613acec41d700186e9ed4c3d2c3cbc1727;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=97ac380aa327d0d4e0a92ec9d8896c526d701470;hpb=e6c873a1bf7291b89cfcfe76184c4154c61056e1;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 97ac380..6ca0946 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,37 @@
 /*
- * 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.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 +252,7 @@
  */
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -253,7 +280,7 @@ int main (int argc, char **argv)
     int cmd = 0;
     char *arg;
     char *configName = NULL;
-    int nsections;
+    int nsections = 0;
     int disableCommit = 0;
     size_t mem_max = 0;
 
@@ -263,6 +290,7 @@ int main (int argc, char **argv)
 
 #if ZEBRASDR
     zebraSdr_std ();
+    rGroupDef.useSDR = 0;
 #endif
     rGroupDef.groupName = NULL;
     rGroupDef.databaseName = NULL;
@@ -299,12 +327,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: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)
         {
@@ -362,7 +398,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 +433,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 +520,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 +530,11 @@ 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");
+#if HAVE_BZLIB_H
+            fprintf (stderr, "libbzip2\n"
+		     " (C) 1996-1998 Julian R Seward.  All rights reserved.\n");
+#endif
         }
         else if (ret == 'v')
             log_init_level (log_mask_str(arg));
@@ -504,9 +556,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 ();