X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fmain.c;h=725aeade890d31f8f1c73150a715d725028dd194;hb=a43a80295abc7fd1b2caecb0de0dadd3003cab41;hp=a3fb5107dd9aaaa7fd2de2c66ac428ed4e3b6d8c;hpb=4495fac3b7f760814dd3b41d0f64e5077193eeee;p=idzebra-moved-to-github.git
diff --git a/index/main.c b/index/main.c
index a3fb510..725aead 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,19 @@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: main.c,v $
- * Revision 1.29 1995-12-11 11:43:30 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.
+ *
+ * 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.
@@ -148,13 +160,14 @@ int main (int argc, char **argv)
" update
Update index with files below .\n"
" If is empty filenames are read from stdin.\n"
" delete Delete index with files below .\n"
+ " commit Commit changes\n"
"Options:\n"
" -t Index files as (grs or text).\n"
" -c Read configuration file .\n"
" -g Index files according to group settings.\n"
" -d Records belong to Z39.50 database .\n"
" -m Use before flushing keys to disk.\n"
- " -n Don't use commit system\n"
+ " -n Don't use shadow system\n"
" -v Set logging to .\n");
exit (1);
}
@@ -184,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 ())
@@ -201,6 +213,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 +225,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 +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);
@@ -270,6 +277,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 +309,8 @@ int main (int argc, char **argv)
exit (1);
}
}
- zebraIndexUnlock ();
+ if (common_resource)
+ zebraIndexUnlock ();
exit (0);
}