*** empty log message ***

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

diff --git a/index/main.c b/index/main.c
index 553e280..e4aa024 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.30  1995-12-12 16:00:59  adam
+ * 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.
+ *
+ * Revision 1.31  1996/01/08  19:15:46  adam
+ * New input filter that works!
+ *
+ * Revision 1.30  1995/12/12  16:00:59  adam
  * System call sync(2) used after update/commit.
  * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
  * and F_RDLCK.
@@ -126,6 +143,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;
@@ -154,16 +177,18 @@ 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"
        " -g <group>    Index files according to group settings.\n"
        " -d <database> Records belong to Z39.50 database <database>.\n"
        " -m <mbytes>   Use <mbytes> before flushing keys to disk.\n"
-        " -n            Don't use commit system\n"
+        " -n            Don't use shadow system\n"
        " -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)
@@ -190,14 +215,13 @@ int main (int argc, char **argv)
                 else if (!strcmp (arg, "commit"))
                 {
                     zebraIndexLock (1);
-                    rval = res_get (common_resource, "commit");
+                    rval = res_get (common_resource, "shadow");
                     if (rval && *rval)
                         bf_cache (1);
                     else
                     {
                         logf (LOG_FATAL, "Cannot perform commit");
-                        logf (LOG_FATAL, "No commit area defined "
-                              "in the configuration file");
+                        logf (LOG_FATAL, "No shadow area defined");
                         exit (1);
                     }
                     if (bf_commitExists ())
@@ -216,10 +240,23 @@ 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);
-                    rval = res_get (common_resource, "commit");
+                    rval = res_get (common_resource, "shadow");
                     if (rval && *rval)
                     {
                         bf_cache (1);
@@ -238,7 +275,7 @@ int main (int argc, char **argv)
                 struct recordGroup rGroup;
 
                 zebraIndexLock (0);
-                rval = res_get (common_resource, "commit");
+                rval = res_get (common_resource, "shadow");
                 if (rval && *rval && !disableCommit)
                 {
                     bf_cache (1);
@@ -303,7 +340,8 @@ int main (int argc, char **argv)
             exit (1);
         }
     }
-    zebraIndexUnlock ();
+    if (common_resource)
+        zebraIndexUnlock ();
     exit (0);
 }