X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=94291692bc01cd72e2f0927477a21a6aa75ad613;hb=cdc04db6a4bcbf0630b5da7cfdf7195a88f0a9f9;hp=23687bbbffc629938b532f57b00c5ee2dc4bb1df;hpb=589b5761fb59634afc37909e62cb34ce56cbbb12;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index 23687bb..9429169 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kinput.c,v $
- * Revision 1.13  1996-02-05 12:30:00  adam
+ * Revision 1.15  1996-03-21 14:50:09  adam
+ * File update uses modify-time instead of change-time.
+ *
+ * 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.
  *
@@ -54,7 +61,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <time.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -424,20 +430,21 @@ void progressFunc (struct key_file *keyp, void *info)
 
     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,