2007.

[idzebra-moved-to-github.git] / index / kinput.c

diff --git a/index/kinput.c b/index/kinput.c
index d15103e..670b099 100644 (file)
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,5 +1,5 @@
-/* $Id: kinput.c,v 1.79 2006-11-27 10:10:14 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: kinput.c,v 1.82 2007-01-15 15:10:16 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -55,7 +55,7 @@ struct key_file {
     Res res;
 };
 
-#if 1
+#if 0
 static void pkey(const char *b, int mode)
 {
     key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d");
@@ -225,11 +225,11 @@ struct heap_info {
     struct zebra_register *reg;
     ZebraHandle zh;
     int raw_reading; /* 1=raw /mem read. 0=file reading */
-    int no_diffs;
-    int no_updates;
-    int no_deletions;
-    int no_insertions;
-    int no_iterations;
+    zint no_diffs;
+    zint no_updates;
+    zint no_deletions;
+    zint no_insertions;
+    zint no_iterations;
 };
 
 static struct heap_info *key_heap_malloc(void)
@@ -818,11 +818,11 @@ void zebra_index_merge (ZebraHandle zh)
     xfree (kf);
     if (hi->no_iterations)
     { /* do not log if nothing happened */
-        yaz_log(YLOG_LOG, "Iterations . . .%7d", hi->no_iterations);
-        yaz_log(YLOG_LOG, "Distinct words .%7d", hi->no_diffs);
-        yaz_log(YLOG_LOG, "Updates. . . . .%7d", hi->no_updates);
-        yaz_log(YLOG_LOG, "Deletions. . . .%7d", hi->no_deletions);
-        yaz_log(YLOG_LOG, "Insertions . . .%7d", hi->no_insertions);
+        yaz_log(YLOG_LOG, "Iterations     %9" ZINT_FORMAT0, hi->no_iterations);
+        yaz_log(YLOG_LOG, "Distinct words %9" ZINT_FORMAT0, hi->no_diffs);
+        yaz_log(YLOG_LOG, "Updates        %9" ZINT_FORMAT0, hi->no_updates);
+        yaz_log(YLOG_LOG, "Deletions      %9" ZINT_FORMAT0, hi->no_deletions);
+        yaz_log(YLOG_LOG, "Insertions     %9" ZINT_FORMAT0, hi->no_insertions);
     }
     key_block_destroy(&zh->reg->key_block);
     key_heap_destroy(hi, nkeys);