wrbuf_puts(w, ",");
}
}
- yaz_log(YLOG_LOG, "using facets str: %s", wrbuf_cstr(w));
+ yaz_log(YLOG_DEBUG, "using facets str: %s", wrbuf_cstr(w));
ZOOM_connection_option_set(link, "facets",
wrbuf_len(w) ? wrbuf_cstr(w) : 0);
wrbuf_destroy(w);
int present_chunk = 20; // Default chunk size
if (opt_present_chunk && strcmp(opt_present_chunk,"")) {
present_chunk = atoi(opt_present_chunk);
+ yaz_log(YLOG_DEBUG, "Present chunk set to %d", present_chunk);
}
-
assert(link);
cl->diagnostic = 0;
+ cl->filtered = 0;
if (extra_args && *extra_args)
ZOOM_connection_option_set(link, "extraArgs", extra_args);
/* A present_chunk less than 1 will disable chunking. */
if (present_chunk > 0 && cl->maxrecs > present_chunk) {
sprintf(present_chunk_str, "%d", present_chunk);
- ZOOM_connection_option_set(link, "presentChunk", opt_present_chunk);
+ ZOOM_connection_option_set(link, "presentChunk", present_chunk_str);
+ yaz_log(YLOG_DEBUG, "Present chunk set to %s", present_chunk_str);
}
- else
+ else {
ZOOM_connection_option_set(link, "presentChunk", maxrecs_str);
-
+ yaz_log(YLOG_DEBUG, "Present chunk set to %s (maxrecs)", maxrecs_str);
+ }
sprintf(startrecs_str, "%d", cl->startrecs);
ZOOM_connection_option_set(link, "start", startrecs_str);
for (i = 0; (name = facet_limits_get(facet_limits, i, &value)); i++)
{
struct setting *s = 0;
-
+ nmem_reset(nmem_tmp);
for (s = sdb->settings[PZ_LIMITMAP]; s; s = s->next)
{
const char *p = strchr(s->name + 3, ':');
break;
}
}
- nmem_reset(nmem_tmp);
if (!s)
{
yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined",
Odr_int client_get_approximation(struct client *cl)
{
- int records = cl->record_offset + cl->filtered;
- if (records > 0) {
- Odr_int approx = (cl->hits * cl->record_offset) / records;
- yaz_log(YLOG_LOG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset, records, approx);
+ if (cl->record_offset > 0) {
+ Odr_int approx = ((10 * cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset + 5) /10;
+ yaz_log(YLOG_DEBUG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx);
return approx;
}
return cl->hits;