X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=5fe9733371fbb44174c69c4cdb1fcf0bf6e5ffac;hb=6988ba91e363565638c27a8d5895ad9afc409e75;hp=d15103e8eb0191d575a866e7394c63a09399213a;hpb=0ee0c058fb3daeca717a4394aa4fd3bc64b5437d;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index d15103e..5fe9733 100644
--- 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.83 2007-02-06 09:32:50 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,12 @@ 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: isam/dict " 
+                ZINT_FORMAT "/" ZINT_FORMAT,
+                hi->no_iterations, hi->no_diffs);
+        yaz_log(YLOG_LOG, "Dict: inserts/updates/deletions: "
+                ZINT_FORMAT "/" ZINT_FORMAT "/" ZINT_FORMAT,
+                hi->no_insertions, hi->no_updates, hi->no_deletions);
     }
     key_block_destroy(&zh->reg->key_block);
     key_heap_destroy(hi, nkeys);