New setting lockPath: directory of various lock files.

[idzebra-moved-to-github.git] / index / main.c

diff --git a/index/main.c b/index/main.c
index 704dc92..f957daf 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.33  1996-02-06 17:11:18  adam
+ * 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
+ * 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
@@ -160,6 +177,7 @@ int main (int argc, char **argv)
     rGroupDef.recordType = NULL;
     rGroupDef.flagStoreData = -1;
     rGroupDef.flagStoreKeys = -1;
+    rGroupDef.fileVerboseFlag = 1;
 
     prog = *argv;
     if (argc < 2)
@@ -170,6 +188,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"
@@ -199,9 +218,12 @@ int main (int argc, char **argv)
                         exit (1);
                     }
                     data1_tabpath = res_get (common_resource, "profilePath");
+                    bf_lockDir (res_get (common_resource, "lockPath"));
                 }
                 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"))
@@ -232,6 +254,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);
@@ -280,6 +315,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)