X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=3ec3a325b0e122ab3118bb7c8d4426f39f2b2bf8;hb=6f7dfe3c3f09f7104c1ae7616c9d207edeab308d;hp=40fc02a0d5291f9c7dcb06ec87d8f444b34306b4;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index 40fc02a..3ec3a32 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,5 +1,5 @@
-/* $Id: invstat.c,v 1.50 2006-05-10 08:13:21 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: invstat.c,v 1.55 2007-10-29 16:57:52 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -51,16 +51,16 @@ static void print_dict_item (ZebraHandle zh, const char *s, zint count,
     char dst[IT_MAX_WORD+1];
     int ord;
     int len = key_SU_decode(&ord, (const unsigned char *) s);
-    int index_type;
+    const char *index_type;
     const char *db = 0;
 
     if (!zh)
 	*dst = '\0';
     else
     {
-        zebraExplain_lookup_ord (zh->reg->zei, ord, &index_type, &db, 0, 0, 0);
+        zebraExplain_lookup_ord (zh->reg->zei, ord, &index_type, &db, 0);
 
-        zebra_term_untrans(zh, index_type, dst, s + len);
+        zebra_term_untrans(zh, *index_type, dst, s + len);
     }
     printf("%02d:%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", ord, count, dst,
 	   firstsys, firstseq, lastsys, lastseq);
@@ -120,7 +120,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     {
         ISAMB_PP pp;
         struct it_key key;
-        int cat = (int) (isam_p & 3);
+        int cat = CAST_ZINT_TO_INT(isam_p & 3);
         int level;
         zint size;
         zint blocks;
@@ -242,13 +242,13 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
 		     stat_info.no_isam_entries[i]);
 
 	    if (stat_info.no_isam_entries[i])
-		fprintf (stdout, " %8d   %f",
-			 (int) ((1023.0 + (double)
-                                 isamc_block_used(zh->reg->isamc, i) *
-				 isamc_block_size(zh->reg->isamc,i))/1024),
-			 ((double) isamc_block_used(zh->reg->isamc, i) *
+		fprintf(stdout, " %8d   %f",
+                        (int) ((1023.0 + (double)
+                          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]);
+                        stat_info.no_isam_entries[i]);
 	    fprintf (stdout, "\n");
 	}
     }