X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=8c18e9f31cf55d8761e28fbc5dcc831daa2cec79;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=1a3fc7665504e39238aa8d435f9962bf46165a9c;hpb=5a47fb16ab0fc9574660a0ed04151f359c826cbf;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 1a3fc76..8c18e9f 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,27 @@
 /*
- * 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.37  1996-03-19 12:43:26  adam
+ * 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.
  *
@@ -193,11 +210,13 @@ 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");
+	" -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 ("Vt:c:g:d:m:v:n", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -215,9 +234,15 @@ int main (int argc, char **argv)
                         exit (1);
                     }
                     data1_tabpath = res_get (common_resource, "profilePath");
+                    bf_lockDir (res_get (common_resource, "lockPath"));
+		    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"))
@@ -273,6 +298,7 @@ int main (int argc, char **argv)
                         zebraIndexLockMsg ("r");
                     }
                     rec_prstat ();
+                    inv_prstat  (FNAME_WORD_DICT, FNAME_WORD_ISAM);
                 }
                 else
                 {
@@ -297,28 +323,42 @@ 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);
-                }
-                else if (cmd == 's')
-                {
+                    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");
@@ -328,6 +368,11 @@ int main (int argc, char **argv)
                 }
             }
         }
+        else if (ret == 'V')
+        {
+            fprintf (stderr, "Zebra %s %s\n",
+                     ZEBRAVER, ZEBRADATE);
+        }
         else if (ret == 'v')
         {
             log_init (log_mask_str(arg), prog, NULL);