X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=bd8037d7c308577968e9b4105f0420d72ae2f092;hb=1ef7d46cdc719bc71b84ea81a1e7b467f9669fba;hp=0a76d95941884c326d14f5ed358bca88d844d037;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index 0a76d95..bd8037d 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,6 +1,6 @@
-/* $Id: invstat.c,v 1.42 2004-11-19 10:26:57 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: invstat.c,v 1.46 2005-04-13 13:03:47 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;
 };
@@ -74,7 +74,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     zint occur = 0;
     int i = 0;
     struct inv_stat_info *stat_info = (struct inv_stat_info*) client;
-    ISAMS_P isam_p;
+    ISAM_P isam_p;
     int firstsys=-1;
     int firstseq=-1;
     int lastsys=-1;
@@ -83,8 +83,8 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     stat_info->no_dict_entries++;
     stat_info->no_dict_bytes += strlen(name);
 
-    assert (*info == sizeof(ISAMS_P));
-    memcpy (&isam_p, info+1, sizeof(ISAMS_P));
+    assert (*info == sizeof(ISAM_P));
+    memcpy (&isam_p, info+1, sizeof(ISAM_P));
 
     if (stat_info->zh->reg->isams)
     {
@@ -108,15 +108,15 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         zint occurx = 0;
 	struct it_key key;
 
-        pp = isc_pp_open (stat_info->zh->reg->isamc, isam_p);
-        occur = isc_pp_num (pp);
-        while (isc_pp_read(pp, &key))
+        pp = isamc_pp_open (stat_info->zh->reg->isamc, isam_p);
+        occur = isamc_pp_num (pp);
+        while (isamc_pp_read(pp, &key))
 	{
             occurx++;
 	}
         assert (occurx == occur);
-	stat_info->no_isam_entries[isc_type(isam_p)] += occur;
-        isc_pp_close (pp);
+	stat_info->no_isam_entries[isamc_type(isam_p)] += occur;
+        isamc_pp_close (pp);
     }
     if (stat_info->zh->reg->isamb)
     {
@@ -124,8 +124,8 @@ 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, 0);
 
@@ -213,19 +213,19 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
     if (zh->reg->isamc)
     {
 	fprintf (stdout, "   Blocks    Occur  Size KB   Bytes/Entry\n");
-	for (i = 0; isc_block_used (zh->reg->isamc, i) >= 0; i++)
+	for (i = 0; isamc_block_used (zh->reg->isamc, i) >= 0; i++)
 	{
 	    fprintf (stdout, " %8" ZINT_FORMAT0 " %8" ZINT_FORMAT0,
-		     isc_block_used (zh->reg->isamc, i),
+		     isamc_block_used (zh->reg->isamc, i),
 		     stat_info.no_isam_entries[i]);
 
 	    if (stat_info.no_isam_entries[i])
 		fprintf (stdout, " %8d   %f",
 			 (int) ((1023.0 + (double)
-                                 isc_block_used(zh->reg->isamc, i) *
-				 isc_block_size(zh->reg->isamc,i))/1024),
-			 ((double) isc_block_used(zh->reg->isamc, i) *
-			  isc_block_size(zh->reg->isamc,i))/
+                                 isamc_block_used(zh->reg->isamc, i) *
+				 isamc_block_size(zh->reg->isamc,i))/1024),
+			 ((double) isamc_block_used(zh->reg->isamc, i) *
+			  isamc_block_size(zh->reg->isamc,i))/
 			 stat_info.no_isam_entries[i]);
 	    fprintf (stdout, "\n");
 	}
@@ -241,11 +241,11 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
                 break;
             fprintf (stdout, "Category   %d\n", i);
             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, "Blocks:    " ZINT_FORMAT "\n", stat_info.isamb_blocks[i]);
+            fprintf (stdout, "Size:      " ZINT_FORMAT "\n", stat_info.isamb_sizes[i]);
             fprintf (stdout, "Entries:   " ZINT_FORMAT "\n",
 		     stat_info.no_isam_entries[i]);
-            fprintf (stdout, "Total      %d\n", stat_info.isamb_blocks[i]*
+            fprintf (stdout, "Total      " ZINT_FORMAT "\n", stat_info.isamb_blocks[i]*
                      bsize);
             for (j = 0; j<5; j++)
                 if (stat_info.isamb_levels[i][j])