Added a few casts from zint to double/int where appropriate.

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

diff --git a/index/invstat.c b/index/invstat.c
index a29be66..2e5f91e 100644 (file)
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,6 +1,6 @@
-/* $Id: invstat.c,v 1.37 2004-08-06 12:28:22 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: invstat.c,v 1.44 2005-03-08 14:02:09 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -36,8 +36,8 @@ struct inv_stat_info {
     int isam_occurrences[20];
     char tmp[128];
     int isamb_levels[10][5];
-    int isamb_sizes[10];
-    int isamb_blocks[10];
+    zint isamb_sizes[10];
+    zint isamb_blocks[10];
     unsigned long cksum;
     int dumpwords;
 };
@@ -63,8 +63,8 @@ static void print_dict_item (ZebraMaps zm, const char *s, zint count,
                 *to++ = *res++;
     }
     *to = '\0';
-    /* yaz_log (LOG_LOG, "%s", keybuf); */
-    printf("%10d %s %d.%d - %d.%d\n",count, keybuf,
+    /* yaz_log (YLOG_LOG, "%s", keybuf); */
+    printf("%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", count, keybuf,
               firstsys,firstseq, lastsys,lastseq);
 }
 
@@ -97,32 +97,11 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         while (isams_pp_read(pp, &key))
        {
             occurx++;
-#if IT_KEY_NEW
-#else
-            stat_info->cksum = stat_info->cksum * 65509 + 
-                key.sysno + 11 * key.seqno;
-            if (-1==firstsys)
-            {
-                firstseq=key.seqno;
-                firstsys=key.sysno;
-            }
-            lastsys=key.sysno;
-            lastseq=key.seqno;
-#endif
        }
         assert (occurx == occur);
        stat_info->no_isam_entries[0] += occur;
         isams_pp_close (pp);
     }
-    if (stat_info->zh->reg->isam)
-    {
-        ISPT ispt;
-
-        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);
-    }
     if (stat_info->zh->reg->isamc)
     {
         ISAMC_PP pp;
@@ -134,18 +113,6 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         while (isc_pp_read(pp, &key))
        {
             occurx++;
-#if IT_KEY_NEW
-#else
-            stat_info->cksum = stat_info->cksum * 65509 + 
-                key.sysno + 11 * key.seqno;
-            if (-1==firstsys)
-            {
-                firstseq=key.seqno;
-                firstsys=key.sysno;
-            }
-            lastsys=key.sysno;
-            lastseq=key.seqno;
-#endif
        }
         assert (occurx == occur);
        stat_info->no_isam_entries[isc_type(isam_p)] += occur;
@@ -157,26 +124,14 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         struct it_key key;
         int cat = (int) (isam_p & 3);
         int level;
-        int size;
-        int blocks;
+        zint size;
+        zint blocks;
         
-        pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level);
+        pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level, 0);
 
         while (isamb_pp_read(pp, &key))
         {
             occur++;
-#if IT_KEY_NEW
-#else
-            stat_info->cksum = stat_info->cksum * 65509 + 
-                key.sysno + 11 * key.seqno;
-            if (-1==firstsys)
-            {
-                firstseq=key.seqno;
-                firstsys=key.sysno;
-            }
-            lastsys=key.sysno;
-            lastseq=key.seqno;
-#endif
         }
         isamb_pp_close_x (pp, &size, &blocks);
         stat_info->isamb_blocks[cat] += blocks;
@@ -260,7 +215,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 +243,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 +260,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++)