-/* $Id: cfile.c,v 1.29 2004-08-06 12:28:22 adam Exp $
+/* $Id: cfile.c,v 1.30 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_read no=" ZINT_FORMAT ", block=%d", no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_read no=" ZINT_FORMAT " block=" ZINT_FORMAT, no, block);
exit (1);
}
return 1;
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_write no=" ZINT_FORMAT ", block=%d", no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_write no=" ZINT_FORMAT
+ " block=" ZINT_FORMAT, no, block);
exit (1);
}
return 0;
-/* $Id: commit.c,v 1.18 2004-08-06 12:28:22 adam Exp $
+/* $Id: commit.c,v 1.19 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
if (!mf_read (cf->hash_mf, hno, 0, 0, fp) &&
hno != cf->head.flat_bucket-1)
{
- logf (LOG_FATAL, "read index block hno=%d (" ZINT_FORMAT "-" ZINT_FORMAT ") commit",
+ logf (LOG_FATAL, "read index block hno=" ZINT_FORMAT
+ " (" ZINT_FORMAT "-" ZINT_FORMAT ") commit",
hno, cf->head.next_bucket, cf->head.flat_bucket-1);
}
for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
#else
if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf))
{
- logf (LOG_FATAL, "read data block hno=%d (" ZINT_FORMAT "-" ZINT_FORMAT ") "
+ logf (LOG_FATAL, "read data block hno=" ZINT_FORMAT " (" ZINT_FORMAT "-" ZINT_FORMAT ") "
"i=%d commit block at " ZINT_FORMAT " (->" ZINT_FORMAT")",
hno, cf->head.next_bucket, cf->head.flat_bucket-1,
i, fp[i], vno);
-/* $Id: mfile.c,v 1.54 2004-08-06 12:28:22 adam Exp $
+/* $Id: mfile.c,v 1.55 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
if ((nblocks = (int) (mf->files[mf->cur_file].dir->avail_bytes /
mf->blocksize)) > 0)
{
- logf (LOG_DEBUG, "Capping off file %s at pos %d",
+ logf (LOG_DEBUG, "Capping off file %s at pos " ZINT_FORMAT,
mf->files[mf->cur_file].path, nblocks);
if ((ps = file_position(mf,
(mf->cur_file ? mf->files[mf->cur_file-1].top : 0) +
mf->name);
exit(1);
}
- logf (LOG_DEBUG, "ps = %d", ps);
+ logf (LOG_DEBUG, "ps = " ZINT_FORMAT, ps);
if (write(mf->files[mf->cur_file].fd, &dummych, 1) < 1)
{
logf (LOG_ERRNO|LOG_FATAL, "mf_write %s internal error (3)",
-/* $Id: rset.h,v 1.27 2004-08-06 12:28:22 adam Exp $
+/* $Id: rset.h,v 1.28 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
char *name;
zint nn;
char *flags;
- int count;
+ zint count;
int type;
};
-/* $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.38 2004-08-06 12:55:01 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
}
*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);
}
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])
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++)
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++)
-/* $Id: recstat.c,v 1.9 2004-08-04 08:35:23 adam Exp $
+/* $Id: recstat.c,v 1.10 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for (i = 0; i< REC_BLOCK_TYPES; i++)
{
- logf (LOG_LOG, "Record blocks of size " ZINT_FORMAT,
+ logf (LOG_LOG, "Record blocks of size %d",
records->head.block_size[i]);
logf (LOG_LOG,
" Used/Total/Bytes used "
-/* $Id: zsets.c,v 1.52 2004-08-06 10:09:27 heikki Exp $
+/* $Id: zsets.c,v 1.53 2004-08-06 12:55:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
rset_close (rset, rfd);
for (i = 0; i < rset->no_rset_terms; i++)
- yaz_log (LOG_LOG, "term=\"%s\" nn=%d type=%s count=%d",
+ yaz_log (LOG_LOG, "term=\"%s\" nn=" ZINT_FORMAT " type=%s count=" ZINT_FORMAT,
rset->rset_terms[i]->name,
rset->rset_terms[i]->nn,
rset->rset_terms[i]->flags,
rset_close (rset, rfd);
for (i = 0; i < rset->no_rset_terms; i++)
- yaz_log (LOG_LOG, "term=\"%s\" nn=%d type=%s count=%d",
+ yaz_log (LOG_LOG, "term=\"%s\" nn=" ZINT_FORMAT " type=%s count=" ZINT_FORMAT,
rset->rset_terms[i]->name,
rset->rset_terms[i]->nn,
rset->rset_terms[i]->flags,
-/* $Id: merge.c,v 1.25 2004-08-06 12:28:23 adam Exp $
+/* $Id: merge.c,v 1.26 2004-08-06 12:55:02 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
if (border < new_offset && border >= r_offset)
{
if (debug > 2)
- logf (LOG_LOG, "isc: border %d %d", ptr, border);
+ logf (LOG_LOG, "isc: border %d " ZINT_FORMAT,
+ ptr, border);
/* Max size of current block category reached ...
make new virtual block entry */
mb[++ptr].block = 0;
ptr = j;
border = get_border (is, mb, ptr, cat, firstpos);
if (debug > 3)
- logf (LOG_LOG, "isc: border=%d r_offset=%d", border, r_offset);
+ logf (LOG_LOG, "isc: border=" ZINT_FORMAT " r_offset=%d",
+ border, r_offset);
}
}
if (mb[ptr].offset < r_offset)
-/* $Id: recgrs.c,v 1.86 2004-05-21 11:58:56 adam Exp $
+/* $Id: recgrs.c,v 1.87 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
dnew->u.data.what = DATA1I_text;
dnew->u.data.data = dnew->lbuf;
- sprintf(dnew->u.data.data, "%d", p->localno);
+ sprintf(dnew->u.data.data, ZINT_FORMAT, p->localno);
dnew->u.data.len = strlen(dnew->u.data.data);
}
#if 0
-/* $Id: rectext.c,v 1.18 2004-06-16 20:32:41 adam Exp $
+/* $Id: rectext.c,v 1.19 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
sprintf (text_buf, "Rank: %d\n", p->score);
text_ptr = strlen(text_buf);
}
- sprintf (text_buf + text_ptr, "Local Number: %d\n", p->localno);
+ sprintf (text_buf + text_ptr, "Local Number: " ZINT_FORMAT "\n",
+ p->localno);
text_ptr = strlen(text_buf);
if (p->fname)
{
-/* $Id: rsisamb.c,v 1.13 2004-08-06 10:09:28 heikki Exp $
+/* $Id: rsisamb.c,v 1.14 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
- int *countp;
+ zint *countp;
void *buf;
};
-/* $Id: rsisamc.c,v 1.16 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisamc.c,v 1.17 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
ISAMC_PP pt;
struct rset_pp_info *next;
struct rset_isamc_info *info;
- int *countp;
+ zint *countp;
void *buf;
};
-/* $Id: rsm_or.c,v 1.16 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsm_or.c,v 1.17 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
struct rset_mor_rfd *next;
struct rset_mor_info *info;
struct trunc_info *ti;
- int *countp;
+ zint *countp;
char *pbuf;
};
-/* $Id: rstemp.c,v 1.41 2004-08-06 12:28:23 adam Exp $
+/* $Id: rstemp.c,v 1.42 2004-08-06 12:55:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
struct rset_temp_rfd {
struct rset_temp_info *info;
struct rset_temp_rfd *next;
- int *countp;
+ zint *countp;
void *buf;
size_t pos_cur; /* current position in set */
zint cur; /* number of the current hit */