X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fmain.c;h=725aeade890d31f8f1c73150a715d725028dd194;hb=a43a80295abc7fd1b2caecb0de0dadd3003cab41;hp=553e280e83d4a56e99e8ec8ea41aeda9211107ad;hpb=7e3b091d6944a2ef10f1c6e983181be53b565e34;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 553e280..725aead 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.30  1995-12-12 16:00:59  adam
+ * 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.
@@ -160,7 +167,7 @@ int main (int argc, char **argv)
 	" -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);
     }
@@ -190,14 +197,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 ())
@@ -219,7 +225,7 @@ int main (int argc, char **argv)
                 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 +244,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 +309,8 @@ int main (int argc, char **argv)
             exit (1);
         }
     }
-    zebraIndexUnlock ();
+    if (common_resource)
+        zebraIndexUnlock ();
     exit (0);
 }