X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=1a3fc7665504e39238aa8d435f9962bf46165a9c;hb=3e97ca3e99068d83691ad6d43d53dd9f1f316889;hp=725aeade890d31f8f1c73150a715d725028dd194;hpb=a43a80295abc7fd1b2caecb0de0dadd3003cab41;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 725aead..1a3fc76 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.32  1996-02-01 20:50:04  adam
+ * 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
+ * New code command: unread.
+ *
+ * Revision 1.34  1996/02/07  14:06:39  adam
+ * Better progress report during register merge.
+ * New command: clean - removes temporary shadow files.
+ *
+ * Revision 1.33  1996/02/06  17:11:18  adam
+ * Minor changes.
+ *
+ * Revision 1.32  1996/02/01  20:50:04  adam
  * Bug fix: zebraIndexUnlock was always called even though zebraIndexLock
  * was never called - happens when no commands are specified.
  *
@@ -133,6 +150,12 @@ char *prog;
 size_t mem_max = 4*1024*1024;
 extern char *data1_tabpath;
 
+static void abort_func (int level, const char *msg, void *info)
+{
+    if (level & LOG_FATAL)
+        abort ();
+}
+
 int main (int argc, char **argv)
 {
     int ret;
@@ -151,6 +174,7 @@ int main (int argc, char **argv)
     rGroupDef.recordType = NULL;
     rGroupDef.flagStoreData = -1;
     rGroupDef.flagStoreKeys = -1;
+    rGroupDef.fileVerboseFlag = 1;
 
     prog = *argv;
     if (argc < 2)
@@ -161,6 +185,7 @@ int main (int argc, char **argv)
 	"               If <dir> is empty filenames are read from stdin.\n"
         " delete <dir>  Delete index with files below <dir>.\n"
         " commit        Commit changes\n"
+        " clean         Clean shadow files\n"
         "Options:\n"
 	" -t <type>     Index files as <type> (grs or text).\n"
 	" -c <config>   Read configuration file <config>.\n"
@@ -171,6 +196,7 @@ int main (int argc, char **argv)
 	" -v <level>    Set logging to <level>.\n");
         exit (1);
     }
+    log_event_end (abort_func, NULL);
     while ((ret = options ("t:c:g:d:m:v:n", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
@@ -192,6 +218,8 @@ int main (int argc, char **argv)
                 }
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
+                else if (!strcmp (arg, "dump"))
+                    cmd = 's';
                 else if (!strcmp (arg, "del") || !strcmp(arg, "delete"))
                     cmd = 'd';
                 else if (!strcmp (arg, "commit"))
@@ -222,6 +250,19 @@ int main (int argc, char **argv)
                     else
                         logf (LOG_LOG, "Nothing to commit");
                 }
+                else if (!strcmp (arg, "clean"))
+                {
+                    zebraIndexLock (1);
+                    if (bf_commitExists ())
+                    {
+                        zebraIndexLockMsg ("d");
+                        zebraIndexWait (0);
+                        logf (LOG_LOG, "Commit clean");
+                        bf_commitClean ();
+                    }
+                    else
+                        logf (LOG_LOG, "Nothing to clean");
+                }
                 else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
                 {
                     zebraIndexLock (0);
@@ -270,6 +311,12 @@ int main (int argc, char **argv)
                     logf (LOG_LOG, "Deleting %s", rGroup.path);
                     repositoryDelete (&rGroup);
                 }
+                else if (cmd == 's')
+                {
+                    logf (LOG_LOG, "Dumping %s", rGroup.path);
+                    repositoryShow (&rGroup);
+                }
+
                 cmd = 0;
                 nsections = key_close ();
                 if (nsections)