X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=4658e64378dc0a1525bed37f401581a877dbc3c9;hb=6a0f9234f945bc4956e2bcef75f715661a9eba9a;hp=8a1cf1ab3c4f57df6415890d0b01286cd93a9cad;hpb=1369748dd7899789c97d94801048bf942e0cc6e6;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index 8a1cf1a..4658e64 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,8 +1,5 @@
-/* $Id: invstat.c,v 1.51 2006-05-19 23:20:24 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,9 +12,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,7 +48,7 @@ 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)
@@ -120,7 +117,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 +239,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");
 	}
     }
@@ -294,6 +291,7 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
     }
     fprintf (stdout, "%7d-        %7d\n",
              prev, stat_info.isam_occurrences[i]);
+    rec_prstat(zh->reg->records, 0);
     xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
     zebra_end_read (zh);
     return 0;
@@ -302,6 +300,7 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab