struct parameters global_parameters =
{
0, // dump_records
- 0, // debug_mode
- 100,
+ 0 // debug_mode
};
static void log_xml_doc(xmlDoc *doc)
s->termlists[i].name = nmem_strdup(s->nmem, type);
s->termlists[i].termlist
- = termlist_create(s->nmem, s->expected_maxrecs,
- TERMLIST_HIGH_SCORE);
+ = termlist_create(s->nmem, TERMLIST_HIGH_SCORE);
s->num_termlists = i + 1;
}
termlist_insert(s->termlists[i].termlist, value);
new->type = PAZPAR2_STRING_MATCH;
else if ((eq = strchr(values[i], '~')))
new->type = PAZPAR2_SUBSTRING_MATCH;
- else if (!eq)
+ else
{
yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter");
return 0;
}
enum pazpar2_error_code search(struct session *se,
- const char *query, const char *filter,
+ const char *query,
+ const char *maxrecs,
+ const char *filter,
const char **addinfo)
{
int live_channels = 0;
live_channels = select_targets(se, criteria);
if (live_channels)
{
- int maxrecs = live_channels * global_parameters.toget; // This is buggy!!!
- se->reclist = reclist_create(se->nmem, maxrecs);
- se->expected_maxrecs = maxrecs;
+ se->reclist = reclist_create(se->nmem);
}
else
return PAZPAR2_NO_TARGETS;
for (cl = se->clients; cl; cl = client_next_in_session(cl))
{
+ if (maxrecs)
+ client_set_maxrecs(cl, atoi(maxrecs));
if (prepare_session_database(se, client_get_database(cl)) < 0)
continue;
// Parse query for target
session->num_termlists = 0;
session->reclist = 0;
session->clients = 0;
- session->expected_maxrecs = 0;
session->session_nmem = nmem;
session->nmem = nmem_create();
session->wrbuf = wrbuf_alloc();
}
reclist_sort(s->reclist, sp);
- *total = s->reclist->num_records;
+ *total = reclist_get_num_records(s->reclist);
*sumhits = s->total_hits;
for (i = 0; i < start; i++)
service,
record, (char *) mergekey_norm,
&se->total_merged);
- if (global_parameters.dump_records)
- yaz_log(YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
- sdb->database->url, record_no);
if (!cluster)
{
/* no room for record */
xmlFreeDoc(xdoc);
return 0;
}
+ if (global_parameters.dump_records)
+ yaz_log(YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
+ sdb->database->url, record_no);
relevance_newrec(se->relevance, cluster);
// now parsing XML record and adding data to cluster or record metadata