X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=c8e3a2870962725aa96d1ab12dd679b3d32055ca;hb=87e6195e30805568aae3d2071047a8ba6ae5b760;hp=b7e71b12d328b948f39d1468e0f9c9e174019db8;hpb=0d2825772055a5aeb7086d5a7d2d600cf498445e;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index b7e71b1..c8e3a28 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,46 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.36  1996-02-12 18:45:37  adam
+ * Revision 1.46  1997-02-10 10:20:13  adam
+ * Flag fileVerboseFlag set to 0 (default).
+ *
+ * Revision 1.45  1996/11/08 11:10:26  adam
+ * Buffers used during file match got bigger.
+ * Compressed ISAM support everywhere.
+ * Bug fixes regarding masking characters in queries.
+ * Redesigned Regexp-2 queries.
+ *
+ * Revision 1.44  1996/10/29 14:09:48  adam
+ * Use of cisam system - enabled if setting isamc is 1.
+ *
+ * Revision 1.43  1996/06/06 12:08:42  quinn
+ * Added showRecord function
+ *
+ * Revision 1.42  1996/05/31  09:07:01  quinn
+ * Work on character-set handling
+ *
+ * Revision 1.41  1996/05/14  14:04:34  adam
+ * In zebraidx, the 'stat' command is improved. Statistics about ISAM/DICT
+ * is collected.
+ *
+ * Revision 1.40  1996/04/26  10:00:23  adam
+ * Added option -V to zebraidx to display version information.
+ * Removed stupid warnings from file update.
+ *
+ * Revision 1.39  1996/04/09  10:05:21  adam
+ * Bug fix: prev_name buffer possibly too small; allocated in key_file_init.
+ *
+ * Revision 1.38  1996/03/26  16:01:14  adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.37  1996/03/19  12:43:26  adam
+ * Bug fix: File update traversal didn't handle trailing slashes correctly.
+ * Bug fix: Update of sub directory groups wasn't handled correctly.
+ *
+ * Revision 1.36  1996/02/12  18:45:37  adam
  * New fileVerboseFlag in record group control.
  *
  * Revision 1.35  1996/02/12  15:56:11  adam
@@ -138,13 +174,11 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <alexutil.h>
 #include <data1.h>
 #include "index.h"
 
 char *prog;
-size_t mem_max = 4*1024*1024;
-extern char *data1_tabpath;
+size_t mem_max = 0;
 
 static void abort_func (int level, const char *msg, void *info)
 {
@@ -170,7 +204,8 @@ int main (int argc, char **argv)
     rGroupDef.recordType = NULL;
     rGroupDef.flagStoreData = -1;
     rGroupDef.flagStoreKeys = -1;
-    rGroupDef.fileVerboseFlag = 1;
+    rGroupDef.flagShowRecords = 0;
+    rGroupDef.fileVerboseFlag = 0;
 
     prog = *argv;
     if (argc < 2)
@@ -189,11 +224,14 @@ int main (int argc, char **argv)
 	" -d <database> Records belong to Z39.50 database <database>.\n"
 	" -m <mbytes>   Use <mbytes> before flushing keys to disk.\n"
         " -n            Don't use shadow system\n"
-	" -v <level>    Set logging to <level>.\n");
+	" -s            Show analysis on stdout, but do no work\n"
+	" -v <level>    Set logging to <level>\n"
+        " -V            Show version\n"
+                 );
         exit (1);
     }
     log_event_end (abort_func, NULL);
-    while ((ret = options ("t:c:g:d:m:v:n", argv, argc, &arg)) != -2)
+    while ((ret = options ("sVt:c:g:d:m:v:n", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -210,10 +248,19 @@ int main (int argc, char **argv)
                               configName);
                         exit (1);
                     }
-                    data1_tabpath = res_get (common_resource, "profilePath");
+                    data1_set_tabpath (res_get (common_resource,
+                                                "profilePath"));
+                    bf_lockDir (res_get (common_resource, "lockDir"));
+		    init_charmap();
                 }
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
+                else if (!strcmp (arg, "update1"))
+                    cmd = 'U';
+                else if (!strcmp (arg, "update2"))
+                    cmd = 'm';
+                else if (!strcmp (arg, "dump"))
+                    cmd = 's';
                 else if (!strcmp (arg, "del") || !strcmp(arg, "delete"))
                     cmd = 'd';
                 else if (!strcmp (arg, "commit"))
@@ -267,6 +314,7 @@ int main (int argc, char **argv)
                         zebraIndexLockMsg ("r");
                     }
                     rec_prstat ();
+                    inv_prstat ();
                 }
                 else
                 {
@@ -291,31 +339,55 @@ int main (int argc, char **argv)
                     zebraIndexLockMsg ("w");
                 }
                 zebraIndexWait (0);
-
+                
                 memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
-                key_open (mem_max);
                 rGroup.path = arg;
-                if (cmd == 'u')
+                switch (cmd)
                 {
+                case 'u':
+                    key_open (mem_max);
                     logf (LOG_LOG, "Updating %s", rGroup.path);
                     repositoryUpdate (&rGroup);
-                }
-                else if (cmd == 'd')
-                {
+                    nsections = key_close ();
+                    break;
+                case 'U':
+                    key_open (mem_max);
+                    logf (LOG_LOG, "Updating (pass 1) %s", rGroup.path);
+                    repositoryUpdate (&rGroup);
+                    key_close ();
+                    nsections = 0;
+                    break;
+                case 'd':
+                    key_open (mem_max);
                     logf (LOG_LOG, "Deleting %s", rGroup.path);
                     repositoryDelete (&rGroup);
+                    nsections = key_close ();
+                    break;
+                case 's':
+                    logf (LOG_LOG, "Dumping %s", rGroup.path);
+                    repositoryShow (&rGroup);
+                    nsections = 0;
+                    break;
+                case 'm':
+                    nsections = -1;
+                    break;
+                default:
+                    nsections = 0;
                 }
                 cmd = 0;
-                nsections = key_close ();
                 if (nsections)
                 {
                     logf (LOG_LOG, "Merging with index");
-                    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
-                               60);
+                    key_input (nsections, 60);
                     sync ();
                 }
             }
         }
+        else if (ret == 'V')
+        {
+            fprintf (stderr, "Zebra %s %s\n",
+                     ZEBRAVER, ZEBRADATE);
+        }
         else if (ret == 'v')
         {
             log_init (log_mask_str(arg), prog, NULL);
@@ -328,6 +400,11 @@ int main (int argc, char **argv)
         {
             rGroupDef.databaseName = arg;
         }
+	else if (ret == 's')
+	{
+	    rGroupDef.flagShowRecords = 1;
+            rGroupDef.fileVerboseFlag = 1;
+	}
         else if (ret == 'g')
         {
             rGroupDef.groupName = arg;