projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fixes. Many things still broken...
[idzebra-moved-to-github.git]
/
index
/
invstat.c
diff --git
a/index/invstat.c
b/index/invstat.c
index
a29be66
..
ca1427d
100644
(file)
--- a/
index/invstat.c
+++ b/
index/invstat.c
@@
-1,5
+1,5
@@
-/* $Id: invstat.c,v 1.37 2004-08-06 12:28:22 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: invstat.c,v 1.40 2004-09-09 10:08:05 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-64,7
+64,7
@@
static void print_dict_item (ZebraMaps zm, const char *s, zint count,
}
*to = '\0';
/* yaz_log (LOG_LOG, "%s", keybuf); */
}
*to = '\0';
/* yaz_log (LOG_LOG, "%s", keybuf); */
- printf("%10d %s %d.%d - %d.%d\n",count, keybuf,
+ printf("%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", count, keybuf,
firstsys,firstseq, lastsys,lastseq);
}
firstsys,firstseq, lastsys,lastseq);
}
@@
-114,15
+114,6
@@
static int inv_stat_handle (char *name, const char *info, int pos,
stat_info->no_isam_entries[0] += occur;
isams_pp_close (pp);
}
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;
if (stat_info->zh->reg->isamc)
{
ISAMC_PP pp;
@@
-160,7
+151,7
@@
static int inv_stat_handle (char *name, const char *info, int pos,
int size;
int blocks;
int size;
int 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))
{
while (isamb_pp_read(pp, &key))
{
@@
-260,7
+251,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, " 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])
stat_info.no_isam_entries[i]);
if (stat_info.no_isam_entries[i])
@@
-287,7
+279,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, "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++)
fprintf (stdout, "Total %d\n", stat_info.isamb_blocks[i]*
bsize);
for (j = 0; j<5; j++)
@@
-303,7
+296,7
@@
int zebra_register_statistics (ZebraHandle zh, int dumpdict)
occur = 0;
for (i = 0; i<9; i++)
occur += stat_info.no_isam_entries[i];
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++)
fprintf (stdout, " Occurrences Words\n");
prev = 1;
for (i = 0; stat_info.isam_bounds[i]; i++)