nmake: align with pazpar2 WRT icu/libxslt

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

diff --git a/index/invstat.c b/index/invstat.c
index 40fc02a..253a88a 100644 (file)
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,8 +1,5 @@
-/* $Id: invstat.c,v 1.50 2006-05-10 08:13:21 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) 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,12 +12,15 @@ 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
+
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -42,7 +42,7 @@ struct inv_stat_info {
     int dumpwords;
 };
 
-#define SINGLETON_TYPE 8 /* the type to use for singletons that */ 
+#define SINGLETON_TYPE 8 /* the type to use for singletons that */
                          /* have no block and no block type */
 
 static void print_dict_item (ZebraHandle zh, const char *s, zint count,
@@ -51,14 +51,14 @@ 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);
     }
@@ -120,11 +120,11 @@ 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;
-        
+
         pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level, 0);
 
         while (isamb_pp_read(pp, &key))
@@ -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");
        }
     }
@@ -294,7 +294,8 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
     }
     fprintf (stdout, "%7d-        %7d\n",
              prev, stat_info.isam_occurrences[i]);
-    xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
+    rec_prstat(zh->reg->records, 0);
+    xmalloc_trav("unfreed"); /*! while hunting memory leaks */
     zebra_end_read (zh);
     return 0;
 }
@@ -302,6 +303,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