* Sebastian Hammer, Adam Dickmeiss
*
* $Log: main.c,v $
- * Revision 1.29 1995-12-11 11:43:30 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
+ * 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.
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;
rGroupDef.recordType = NULL;
rGroupDef.flagStoreData = -1;
rGroupDef.flagStoreKeys = -1;
+ rGroupDef.fileVerboseFlag = 1;
prog = *argv;
if (argc < 2)
" 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"
+ " 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)
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"))
{
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 ())
zebraIndexWait (1);
logf (LOG_LOG, "Commit execute");
bf_commitExec ();
+ sync ();
zebraIndexLockMsg ("d");
zebraIndexWait (0);
logf (LOG_LOG, "Commit clean");
else
logf (LOG_LOG, "Nothing to commit");
}
- else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
+ else if (!strcmp (arg, "clean"))
{
- zebraIndexLock (0);
- bf_cache (0);
- rec_prstat ();
+ 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, "cstat") || !strcmp (arg, "cstatus"))
+ else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
{
- zebraIndexLock (1);
- rval = res_get (common_resource, "commit");
+ zebraIndexLock (0);
+ rval = res_get (common_resource, "shadow");
if (rval && *rval)
{
bf_cache (1);
struct recordGroup rGroup;
zebraIndexLock (0);
- rval = res_get (common_resource, "commit");
+ rval = res_get (common_resource, "shadow");
if (rval && *rval && !disableCommit)
{
bf_cache (1);
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)
logf (LOG_LOG, "Merging with index");
key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
60);
+ sync ();
}
}
}
exit (1);
}
}
- zebraIndexUnlock ();
+ if (common_resource)
+ zebraIndexUnlock ();
exit (0);
}
projects / idzebra-moved-to-github.git / blobdiff