-/* $Id: extract.c,v 1.159 2004-08-06 13:36:22 adam Exp $
+/* $Id: extract.c,v 1.160 2004-08-10 08:19:15 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
++zh->records_processed;
if (!(zh->records_processed % 1000))
{
- logf (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
+ logf (LOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+ ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT,
zh->records_processed, zh->records_inserted, zh->records_updated,
zh->records_deleted);
}
if (zh->reg->key_buf_used + 1024 >
(zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
extract_flushWriteKeys (zh,0);
- assert(zh->reg->ptr_i >= 0);
++(zh->reg->ptr_i);
assert(zh->reg->ptr_i > 0);
(zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
-/* $Id: index.h,v 1.112 2004-08-06 13:36:23 adam Exp $
+/* $Id: index.h,v 1.113 2004-08-10 08:19:15 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Res res;
char *user_perm;
int errCode;
- int hits;
+ zint hits;
char *errString;
#if HAVE_SYS_TIMES_H
struct tms tms1;
#endif
int shadow_enable;
- int records_inserted;
- int records_updated;
- int records_deleted;
- int records_processed;
+ zint records_inserted;
+ zint records_updated;
+ zint records_deleted;
+ zint records_processed;
char *record_encoding;
yaz_iconv_t iconv_to_utf8;
-/* $Id: retrieve.c,v 1.23 2004-08-06 09:43:03 heikki Exp $
+/* $Id: retrieve.c,v 1.24 2004-08-10 08:19:15 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
int l = fc->record_int_len - fc->record_int_pos;
if (l <= 0)
return 0;
- l = (l < (int) count) ? l : count;
+ l = (l < (int) count) ? l : (int) count;
memcpy (buf, fc->record_int_buf + fc->record_int_pos, l);
fc->record_int_pos += l;
return l;
-/* $Id: zebraapi.c,v 1.123 2004-08-06 13:14:46 adam Exp $
+/* $Id: zebraapi.c,v 1.124 2004-08-10 08:19:15 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
zebra_register_close (zh->service, zh->reg);
zh->reg = 0;
- yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
+ yaz_log (LOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+ ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT,
zh->records_processed, zh->records_inserted,
zh->records_updated, zh->records_deleted);
-/* $Id: zsets.c,v 1.54 2004-08-06 13:36:23 adam Exp $
+/* $Id: zsets.c,v 1.55 2004-08-10 08:19:15 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
char *name;
RSET rset;
NMEM nmem;
- int hits;
+ zint hits;
int num_bases;
char **basenames;
Z_RPNQuery *rpn;
const char *db, int set,
int use, const char *term)
{
+ assert(zh); /* compiler shut up */
if (!s->nmem)
s->nmem = nmem_create ();
if (!s->term_entries)
void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num)
{
+ assert(zh); /* compiler shut up about unused arg */
xfree (records);
}
{
struct zset_sort_entry *new_entry = NULL;
int i, j;
+ assert(zh); /* compiler shut up about unused arg */
i = sort_info->num_entries;
while (--i >= 0)
RSFD rfd;
yaz_log (LOG_LOG, "resultSetSortSingle start");
+ assert(nmem); /* compiler shut up about unused param */
sset->sort_info->num_entries = 0;
sset->hits = 0;
(*rc->add) (handle, this_sys, term_index);
if ( (est==-2) && (zebraSet->hits==esthits))
{ /* time to estimate the hits */
- float f;
+ double f;
rset_pos(rset,rfd,&cur,&tot);
if (tot>0) {
- f=1.0*cur/tot;
+ f=cur/tot;
est=(zint)(0.5+zebraSet->hits/f);
- /* FIXME - round the guess to 3 digits */
logf(LOG_LOG, "Estimating hits (%s) "
- "%0.1f->%d"
+ "%0.1f->"ZINT_FORMAT
"; %0.1f->"ZINT_FORMAT,
rset->control->desc,
cur, zebraSet->hits,
tot,est);
+ i=0; /* round to 3 significant digits */
+ while (est>1000) {
+ est/=10;
+ i++;
+ }
+ while (i--) est*=10;
zebraSet->hits=est;
}
}
rset->rset_terms[i]->flags,
rset->rset_terms[i]->count);
- yaz_log (LOG_LOG, ZINT_FORMAT " keys, %d distinct sysnos",
+ yaz_log (LOG_LOG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos",
kno, zebraSet->hits);
}