#include <yaz/oid_db.h>
#include <yaz/snprintf.h>
-#define USE_TIMING 1
+#define USE_TIMING 0
#if USE_TIMING
#include <yaz/timing.h>
#endif
int no_working = 0;
int no_failed_query = 0;
int no_failed_limit = 0;
- struct client_list *l, *l0;
-
- session_alert_watch(se, SESSION_WATCH_SHOW);
- session_alert_watch(se, SESSION_WATCH_BYTARGET);
- session_alert_watch(se, SESSION_WATCH_TERMLIST);
- session_alert_watch(se, SESSION_WATCH_SHOW_PREF);
+ struct client_list *l;
session_log(se, YLOG_DEBUG, "Search");
*addinfo = 0;
+ session_enter(se, "session_search0");
+ if (se->clients_starting)
+ {
+ session_leave(se, "session_search0");
+ return PAZPAR2_NO_ERROR;
+ }
+ se->clients_starting = 1;
+ session_leave(se, "session_search0");
+
if (se->settings_modified) {
session_remove_cached_clients(se);
}
if (!live_channels)
{
session_leave(se, "session_search");
+ se->clients_starting = 0;
return PAZPAR2_NO_TARGETS;
}
{
*addinfo = "limit";
session_leave(se, "session_search");
+ se->clients_starting = 0;
return PAZPAR2_MALFORMED_PARAMETER_VALUE;
}
- l0 = se->clients_active;
- se->clients_active = 0;
session_leave(se, "session_search");
- for (l = l0; l; l = l->next)
+ session_alert_watch(se, SESSION_WATCH_SHOW);
+ session_alert_watch(se, SESSION_WATCH_BYTARGET);
+ session_alert_watch(se, SESSION_WATCH_TERMLIST);
+ session_alert_watch(se, SESSION_WATCH_SHOW_PREF);
+
+ for (l = se->clients_active; l; l = l->next)
{
int parse_ret;
struct client *cl = l->client;
no_working++;
}
}
- session_reset_active_clients(se, l0);
-
+ session_enter(se, "session_search2");
+ se->clients_starting = 0;
+ session_leave(se, "session_search2");
if (no_working == 0)
{
if (no_failed_query > 0)
// Probably session_init_databases_fun should be refactored instead of
// called here.
static struct session_database *load_session_database(struct session *se,
- char *id)
+ const char *id)
{
struct database *db = new_database_inherit_settings(id, se->session_nmem, se->service->settings);
session_init_databases_fun((void*) se, db);
// Find an existing session database. If not found, load it
static struct session_database *find_session_database(struct session *se,
- char *id)
+ const char *id)
{
struct session_database *sdb;
}
// Apply a session override to a database
-void session_apply_setting(struct session *se, char *dbname, char *name,
- char *value)
+void session_apply_setting(struct session *se, const char *dbname,
+ const char *name, const char *value)
{
- struct session_database *sdb = find_session_database(se, dbname);
- struct conf_service *service = se->service;
- struct setting *s;
- int offset = settings_create_offset(service, name);
-
- expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
- se->session_nmem);
-
- // Force later recompute of settings-driven data structures
- // (happens when a search starts and client connections are prepared)
- if (offset == PZ_XSLT)
- sdb->map = 0;
-
- se->settings_modified = 1;
- for (s = sdb->settings[offset]; s; s = s->next)
- if (!strcmp(s->name, name) &&
- dbname && s->target && !strcmp(dbname, s->target))
+ session_enter(se, "session_apply_setting");
+ {
+ struct session_database *sdb = find_session_database(se, dbname);
+ struct conf_service *service = se->service;
+ struct setting *s;
+ int offset = settings_create_offset(service, name);
+
+ expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
+ se->session_nmem);
+ // Force later recompute of settings-driven data structures
+ // (happens when a search starts and client connections are prepared)
+ if (offset == PZ_XSLT)
+ sdb->map = 0;
+ se->settings_modified = 1;
+ for (s = sdb->settings[offset]; s; s = s->next)
+ if (!strcmp(s->name, name) &&
+ dbname && s->target && !strcmp(dbname, s->target))
+ break;
+ if (!s)
{
- s->value = value;
- return;
+ s = nmem_malloc(se->session_nmem, sizeof(*s));
+ s->precedence = 0;
+ s->target = nmem_strdup(se->session_nmem, dbname);
+ s->name = nmem_strdup(se->session_nmem, name);
+ s->next = sdb->settings[offset];
+ sdb->settings[offset] = s;
}
- s = nmem_malloc(se->session_nmem, sizeof(*s));
- s->precedence = 0;
- s->target = dbname;
- s->name = name;
- s->value = value;
- s->next = sdb->settings[offset];
- sdb->settings[offset] = s;
-
+ s->value = nmem_strdup(se->session_nmem, value);
+ }
+ session_leave(se, "session_apply_setting");
}
void session_destroy(struct session *se)
session->facet_limits = 0;
session->mergekey = 0;
session->rank = 0;
+ session->clients_starting = 0;
for (i = 0; i <= SESSION_WATCH_MAX; i++)
{
WRBUF w = wrbuf_alloc();
const char *name = session_setting_oneval(client_get_database(cl),
PZ_NAME);
-
res[*count].id = client_get_id(cl);
res[*count].name = *name ? name : "Unknown";
res[*count].hits = client_get_hits(cl);
res[*count].approximation = client_get_approximation(cl);
- res[*count].records = client_get_num_records(cl);
- res[*count].filtered = client_get_num_records_filtered(cl);
+ res[*count].records = client_get_num_records(cl,
+ &res[*count].filtered,
+ 0, 0);
res[*count].diagnostic =
client_get_diagnostic(cl, &res[*count].message,
&res[*count].addinfo);
}
else
{
- session_log(se, YLOG_LOG, "%s: no more to fetch",
- client_get_id(cl));
+ int filtered;
+ int ingest_failures;
+ int record_failures;
+ int num = client_get_num_records(
+ cl, &filtered, &ingest_failures, &record_failures);
+
+ session_log(se, YLOG_LOG, "%s: hits=" ODR_INT_PRINTF
+ " fetched=%d filtered=%d",
+ client_get_id(cl),
+ client_get_hits(cl),
+ num, filtered);
+ if (ingest_failures || record_failures)
+ {
+ session_log(se, YLOG_WARN, "%s:"
+ " ingest failures=%d record failures=%d",
+ client_get_id(cl),
+ ingest_failures, record_failures);
+ }
}
}
else
{
int ret = 0;
struct session *se = client_get_session(cl);
- struct conf_service *service = se->service;
-
- insert_settings_values(sdb, xdoc, root, service);
if (!check_record_filter(root, sdb))
{
struct session_database *sdb = client_get_database(cl);
struct conf_service *service = se->service;
xmlDoc *xdoc = normalize_record(se, sdb, service, rec, nmem);
- int r = 0;
- xmlNode *root;
+ int r = ingest_xml_record(cl, xdoc, record_no, nmem, 0);
+ client_store_xdoc(cl, record_no, xdoc);
+ return r;
+}
+int ingest_xml_record(struct client *cl, xmlDoc *xdoc,
+ int record_no, NMEM nmem, int cached_copy)
+{
+ struct session *se = client_get_session(cl);
+ struct session_database *sdb = client_get_database(cl);
+ struct conf_service *service = se->service;
+ xmlNode *root;
+ int r = 0;
if (!xdoc)
return -1;
if (sroot->type == XML_ELEMENT_NODE &&
!strcmp((const char *) sroot->name, "record"))
{
+ if (!cached_copy)
+ insert_settings_values(sdb, xdoc, root, service);
r = ingest_sub_record(cl, xdoc, sroot, record_no, nmem, sdb,
mk);
}
mk->value = nmem_strdup(nmem, mergekey_norm);
mk->next = 0;
+ if (!cached_copy)
+ insert_settings_values(sdb, xdoc, root, service);
r = ingest_sub_record(cl, xdoc, root, record_no, nmem, sdb, mk);
}
}
(const char *) root->name);
r = -1;
}
- xmlFreeDoc(xdoc);
return r;
}
if (check_limit_local(cl, record, record_no))
{
- session_log(se, YLOG_LOG, "Facet filtered out record no %d from %s",
- record_no, sdb->database->id);
if (type)
xmlFree(type);
if (value)