Fix term counters to be of type zint. Fix several printfs of zint.

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

diff --git a/index/invstat.c b/index/invstat.c
index 7443538..a02a1a6 100644 (file)
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,5 +1,5 @@
-/* $Id: invstat.c,v 1.36 2004-08-04 08:35:23 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: invstat.c,v 1.38 2004-08-06 12:55:01 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -29,7 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 struct inv_stat_info {
     ZebraHandle zh;
-    int no_isam_entries[9];
+    zint no_isam_entries[9];
     int no_dict_entries;
     int no_dict_bytes;
     int isam_bounds[20];
@@ -45,7 +45,7 @@ struct inv_stat_info {
 #define SINGLETON_TYPE 8 /* the type to use for singletons that */ 
                          /* have no block and no block type */
 
-static void print_dict_item (ZebraMaps zm, const char *s, int count,
+static void print_dict_item (ZebraMaps zm, const char *s, zint count,
             int firstsys, int firstseq, int lastsys, int lastseq )
 {
     int reg_type = s[1];
@@ -64,14 +64,14 @@ static void print_dict_item (ZebraMaps zm, const char *s, int count,
     }
     *to = '\0';
     /* yaz_log (LOG_LOG, "%s", keybuf); */
-    printf("%10d %s %d.%d - %d.%d\n",count, keybuf,
+    printf("%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", count, keybuf,
               firstsys,firstseq, lastsys,lastseq);
 }
 
 static int inv_stat_handle (char *name, const char *info, int pos,
                             void *client)
 {
-    int occur = 0;
+    zint occur = 0;
     int i = 0;
     struct inv_stat_info *stat_info = (struct inv_stat_info*) client;
     ISAMS_P isam_p;
@@ -118,7 +118,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     {
         ISPT ispt;
 
-        ispt = is_position (stat_info->zh->reg->isam, isam_p);
+        ispt = is_position (stat_info->zh->reg->isam, (int) isam_p);
         occur = is_numkeys (ispt);
        stat_info->no_isam_entries[is_type(isam_p)] += occur;
         is_pt_free (ispt);
@@ -126,7 +126,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     if (stat_info->zh->reg->isamc)
     {
         ISAMC_PP pp;
-        int occurx = 0;
+        zint occurx = 0;
        struct it_key key;
 
         pp = isc_pp_open (stat_info->zh->reg->isamc, isam_p);
@@ -155,7 +155,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     {
         ISAMB_PP pp;
         struct it_key key;
-        int cat = isam_p & 3;
+        int cat = (int) (isam_p & 3);
         int level;
         int size;
         int blocks;
@@ -200,7 +200,7 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
 {
     int i, prev;
     int before = 0;
-    int occur;
+    zint occur;
     int after = 1000000000;
     struct inv_stat_info stat_info;
     char term_dict[2*IT_MAX_WORD+2];
@@ -260,7 +260,8 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
        fprintf (stdout, "   Blocks    Occur  Size KB   Bytes/Entry\n");
        for (i = 0; isc_block_used (zh->reg->isamc, i) >= 0; i++)
        {
-           fprintf (stdout, " %8" ZINT_FORMAT0 " %8d", isc_block_used (zh->reg->isamc, i),
+           fprintf (stdout, " %8" ZINT_FORMAT0 " %8" ZINT_FORMAT0,
+                    isc_block_used (zh->reg->isamc, i),
                     stat_info.no_isam_entries[i]);
 
            if (stat_info.no_isam_entries[i])
@@ -287,7 +288,8 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
             fprintf (stdout, "Block size %d\n", bsize);
             fprintf (stdout, "Blocks:    %d\n", stat_info.isamb_blocks[i]);
             fprintf (stdout, "Size:      %d\n", stat_info.isamb_sizes[i]);
-            fprintf (stdout, "Entries:   %d\n", stat_info.no_isam_entries[i]);
+            fprintf (stdout, "Entries:   " ZINT_FORMAT "\n",
+                    stat_info.no_isam_entries[i]);
             fprintf (stdout, "Total      %d\n", stat_info.isamb_blocks[i]*
                      bsize);
             for (j = 0; j<5; j++)
@@ -303,7 +305,7 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
     occur = 0;
     for (i = 0; i<9; i++)
         occur += stat_info.no_isam_entries[i];
-    fprintf (stdout, "Word pos       %d\n", occur);
+    fprintf (stdout, "Word pos       " ZINT_FORMAT "\n", occur);
     fprintf (stdout, "    Occurrences     Words\n");
     prev = 1;
     for (i = 0; stat_info.isam_bounds[i]; i++)