* Sebastian Hammer, Adam Dickmeiss
*
* $Log: kinput.c,v $
- * Revision 1.13 1996-02-05 12:30:00 adam
+ * Revision 1.14 1996-02-07 14:06:37 adam
+ * Better progress report during register merge.
+ * New command: clean - removes temporary shadow files.
+ *
+ * Revision 1.13 1996/02/05 12:30:00 adam
* Logging reduced a bit.
* The remaining running time is estimated during register merge.
*
if (keyp->buf_size <= 0 || p->totalBytes <= 0)
return ;
- p->totalOffset += keyp->buf_size;
time (&now);
- if (now < p->lastTime+10)
- return ;
- p->lastTime = now;
- remaining = (now - p->startTime)*
- ((double) p->totalBytes/p->totalOffset - 1.0);
- if (remaining <= 130)
- logf (LOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
- (100.0*p->totalOffset) / p->totalBytes, (long) remaining);
- else
- logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
- (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
+ if (now >= p->lastTime+10)
+ {
+ p->lastTime = now;
+ remaining = (now - p->startTime)*
+ ((double) p->totalBytes/p->totalOffset - 1.0);
+ if (remaining <= 130)
+ logf (LOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
+ (100.0*p->totalOffset) / p->totalBytes, (long) remaining);
+ else
+ logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
+ (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
+ }
+ p->totalOffset += keyp->buf_size;
}
void key_input (const char *dict_fname, const char *isam_fname,
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: main.c,v $
- * Revision 1.33 1996-02-06 17:11:18 adam
+ * 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
" 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"
else
logf (LOG_LOG, "Nothing to commit");
}
+ else if (!strcmp (arg, "clean"))
+ {
+ zebraIndexLock (0);
+ 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);