X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=704dc92787c04294f5ac10cf51513d4d573d871e;hb=bee234a243b7bfc164f7096f35d1bcb98e7b24a9;hp=a3fb5107dd9aaaa7fd2de2c66ac428ed4e3b6d8c;hpb=4495fac3b7f760814dd3b41d0f64e5077193eeee;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index a3fb510..704dc92 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.29  1995-12-11 11:43:30  adam
+ * 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.
+ *
+ * Revision 1.29  1995/12/11  11:43:30  adam
  * Locking based on fcntl instead of flock.
  * Setting commitEnable removed. Command line option -n can be used to
  * prevent commit if commit setting is defined in the configuration file.
@@ -121,6 +136,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;
@@ -148,16 +169,18 @@ int main (int argc, char **argv)
         " update <dir>  Update index with files below <dir>.\n"
 	"               If <dir> is empty filenames are read from stdin.\n"
         " delete <dir>  Delete index with files below <dir>.\n"
+        " commit        Commit changes\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)
@@ -184,14 +207,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 ())
@@ -201,6 +223,7 @@ int main (int argc, char **argv)
                         zebraIndexWait (1);
                         logf (LOG_LOG, "Commit execute");
                         bf_commitExec ();
+                        sync ();
                         zebraIndexLockMsg ("d");
                         zebraIndexWait (0);
                         logf (LOG_LOG, "Commit clean");
@@ -212,13 +235,7 @@ int main (int argc, char **argv)
                 else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
                 {
                     zebraIndexLock (0);
-                    bf_cache (0);
-                    rec_prstat ();
-                }
-                else if (!strcmp (arg, "cstat") || !strcmp (arg, "cstatus"))
-                {
-                    zebraIndexLock (1);
-                    rval = res_get (common_resource, "commit");
+                    rval = res_get (common_resource, "shadow");
                     if (rval && *rval)
                     {
                         bf_cache (1);
@@ -237,7 +254,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);
@@ -270,6 +287,7 @@ int main (int argc, char **argv)
                     logf (LOG_LOG, "Merging with index");
                     key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
                                60);
+                    sync ();
                 }
             }
         }
@@ -301,7 +319,8 @@ int main (int argc, char **argv)
             exit (1);
         }
     }
-    zebraIndexUnlock ();
+    if (common_resource)
+        zebraIndexUnlock ();
     exit (0);
 }