/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
/* session counting (1) , disable client counting (0) */
static YAZ_MUTEX g_session_mutex = 0;
static int no_sessions = 0;
-static int no_session_total = 0;
static int session_use(int delta)
{
yaz_mutex_create(&g_session_mutex);
yaz_mutex_enter(g_session_mutex);
no_sessions += delta;
- if (delta > 0)
- no_session_total += delta;
sessions = no_sessions;
yaz_mutex_leave(g_session_mutex);
- yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), no_sessions);
+ yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" :
+ (delta > 0 ? "INC" : "DEC"), no_sessions);
return sessions;
}
return session_use(0);
}
-int session_count_total(void)
-{
- int total = 0;
- if (!g_session_mutex)
- return 0;
- yaz_mutex_enter(g_session_mutex);
- total = no_session_total;
- yaz_mutex_leave(g_session_mutex);
- return total;
-}
-
static void log_xml_doc(xmlDoc *doc)
{
FILE *lf = yaz_log_file();
session_log(s, YLOG_DEBUG, "Session unlock by %s", caller);
}
-static void session_normalize_facet(struct session *s, const char *type,
- const char *value,
- WRBUF display_wrbuf,
- WRBUF facet_wrbuf)
+static int run_icu(struct session *s, const char *icu_chain_id,
+ const char *value,
+ WRBUF norm_wr, WRBUF disp_wr)
{
- struct conf_service *service = s->service;
- pp2_charset_token_t prt;
const char *facet_component;
- int i;
- const char *icu_chain_id = 0;
-
- for (i = 0; i < service->num_metadata; i++)
- if (!strcmp((service->metadata + i)->name, type))
- icu_chain_id = (service->metadata + i)->facetrule;
- if (!icu_chain_id)
- icu_chain_id = "facet";
- prt = pp2_charset_token_create(service->charsets, icu_chain_id);
+ struct conf_service *service = s->service;
+ pp2_charset_token_t prt =
+ pp2_charset_token_create(service->charsets, icu_chain_id);
if (!prt)
{
- yaz_log(YLOG_FATAL, "Unknown ICU chain '%s' for facet of type '%s'",
- icu_chain_id, type);
- wrbuf_destroy(facet_wrbuf);
- wrbuf_destroy(display_wrbuf);
- return;
+ session_log(s, YLOG_FATAL,
+ "Unknown ICU chain '%s'", icu_chain_id);
+ return 0;
}
pp2_charset_token_first(prt, value, 0);
while ((facet_component = pp2_charset_token_next(prt)))
const char *display_component;
if (*facet_component)
{
- if (wrbuf_len(facet_wrbuf))
- wrbuf_puts(facet_wrbuf, " ");
- wrbuf_puts(facet_wrbuf, facet_component);
+ if (wrbuf_len(norm_wr))
+ wrbuf_puts(norm_wr, " ");
+ wrbuf_puts(norm_wr, facet_component);
}
display_component = pp2_get_display(prt);
if (display_component)
{
- if (wrbuf_len(display_wrbuf))
- wrbuf_puts(display_wrbuf, " ");
- wrbuf_puts(display_wrbuf, display_component);
+ if (wrbuf_len(disp_wr))
+ wrbuf_puts(disp_wr, " ");
+ wrbuf_puts(disp_wr, display_component);
}
}
pp2_charset_token_destroy(prt);
+ return 1;
+}
+
+static void session_normalize_facet(struct session *s,
+ const char *type, const char *value,
+ WRBUF display_wrbuf, WRBUF facet_wrbuf)
+{
+ struct conf_service *service = s->service;
+ int i;
+ const char *icu_chain_id = 0;
+
+ for (i = 0; i < service->num_metadata; i++)
+ if (!strcmp((service->metadata + i)->name, type))
+ icu_chain_id = (service->metadata + i)->facetrule;
+ if (!icu_chain_id)
+ icu_chain_id = "facet";
+
+ run_icu(s, icu_chain_id, value, facet_wrbuf, display_wrbuf);
}
void add_facet(struct session *s, const char *type, const char *value, int count)
if (wrbuf_len(facet_wrbuf))
{
- int i;
- for (i = 0; i < s->num_termlists; i++)
- if (!strcmp(s->termlists[i].name, type))
+ struct named_termlist **tp = &s->termlists;
+ for (; (*tp); tp = &(*tp)->next)
+ if (!strcmp((*tp)->name, type))
break;
- if (i == s->num_termlists)
+ if (!*tp)
{
- if (i == SESSION_MAX_TERMLISTS)
- {
- session_log(s, YLOG_FATAL, "Too many termlists");
- wrbuf_destroy(facet_wrbuf);
- wrbuf_destroy(display_wrbuf);
- return;
- }
-
- s->termlists[i].name = nmem_strdup(s->nmem, type);
- s->termlists[i].termlist = termlist_create(s->nmem);
- s->num_termlists = i + 1;
+ *tp = nmem_malloc(s->nmem, sizeof(**tp));
+ (*tp)->name = nmem_strdup(s->nmem, type);
+ (*tp)->termlist = termlist_create(s->nmem);
+ (*tp)->next = 0;
}
-
-#if 0
- session_log(s, YLOG_LOG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count);
-#endif
- termlist_insert(s->termlists[i].termlist, wrbuf_cstr(display_wrbuf),
+ termlist_insert((*tp)->termlist, wrbuf_cstr(display_wrbuf),
wrbuf_cstr(facet_wrbuf), count);
}
wrbuf_destroy(facet_wrbuf);
// Add static values from session database settings if applicable
static void insert_settings_values(struct session_database *sdb, xmlDoc *doc,
- struct conf_service *service)
+ xmlNode *root,
+ struct conf_service *service)
{
int i;
const char *val = session_setting_oneval(sdb, offset);
if (val)
{
- xmlNode *r = xmlDocGetRootElement(doc);
- xmlNode *n = xmlNewTextChild(r, 0, (xmlChar *) "metadata",
+ xmlNode *n = xmlNewTextChild(root, 0, (xmlChar *) "metadata",
(xmlChar *) val);
xmlSetProp(n, (xmlChar *) "type", (xmlChar *) md->name);
}
{
session_log(se, YLOG_WARN, "Normalize failed");
}
- else
- {
- insert_settings_values(sdb, rdoc, service);
-
- if (global_parameters.dump_records)
- {
- session_log(se, YLOG_LOG, "Normalized record from %s",
- sdb->database->id);
- log_xml_doc(rdoc);
- }
- }
}
return rdoc;
}
static void session_clear_set(struct session *se, struct reclist_sortparms *sp)
{
reclist_destroy(se->reclist);
- se->reclist = 0;
if (nmem_total(se->nmem))
session_log(se, YLOG_DEBUG, "NMEN operation usage %zd",
nmem_total(se->nmem));
nmem_reset(se->nmem);
se->total_records = se->total_merged = 0;
- se->num_termlists = 0;
+ se->termlists = 0;
+ relevance_clear(se->relevance);
/* reset list of sorted results and clear to relevance search */
se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results));
se->reclist = reclist_create(se->nmem);
}
-static void session_sort_unlocked(struct session *se, struct reclist_sortparms *sp)
+void session_sort(struct session *se, struct reclist_sortparms *sp,
+ const char *mergekey, const char *rank)
{
- struct reclist_sortparms *sr;
struct client_list *l;
const char *field = sp->name;
int increasing = sp->increasing;
int type = sp->type;
int clients_research = 0;
- yaz_log(YLOG_LOG, "session_sort field=%s increasing=%d type=%d", field, increasing, type);
- /* see if we already have sorted for this criteria */
- for (sr = se->sorted_results; sr; sr = sr->next)
+ session_enter(se, "session_sort");
+ session_log(se, YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d",
+ field, increasing, type);
+
+ if (rank && (!se->rank || strcmp(se->rank, rank)))
{
- if (!reclist_sortparms_cmp(sr,sp))
- break;
+ /* new rank must research/reingest anyway */
+ assert(rank);
+ xfree(se->rank);
+ se->rank = *rank ? xstrdup(rank) : 0;
+ clients_research = 1;
+ session_log(se, YLOG_DEBUG, "session_sort: new rank = %s",
+ rank);
}
- if (sr)
+ if (mergekey && (!se->mergekey || strcmp(se->mergekey, mergekey)))
{
- session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d already fetched",
- field, increasing, type);
- return;
+ /* new mergekey must research/reingest anyway */
+ assert(mergekey);
+ xfree(se->mergekey);
+ se->mergekey = *mergekey ? xstrdup(mergekey) : 0;
+ clients_research = 1;
+ session_log(se, YLOG_DEBUG, "session_sort: new mergekey = %s",
+ mergekey);
}
- session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d must fetch",
- field, increasing, type);
+ if (clients_research == 0)
+ {
+ struct reclist_sortparms *sr;
+ for (sr = se->sorted_results; sr; sr = sr->next)
+ if (!reclist_sortparms_cmp(sr, sp))
+ break;
+ if (sr)
+ {
+ session_log(se, YLOG_DEBUG, "session_sort: field=%s increasing=%d type=%d already fetched",
+ field, increasing, type);
+ session_leave(se, "session_sort");
+ return;
+ }
+ }
+ session_log(se, YLOG_DEBUG, "session_sort: field=%s increasing=%d type=%d must fetch",
+ field, increasing, type);
// We need to reset reclist on every sort that changes the records, not just for position
// So if just one client requires new searching, we need to clear set.
client_parse_init(cl, 1);
clients_research += client_parse_sort(cl, sp);
}
- if (clients_research) {
- yaz_log(YLOG_DEBUG, "Reset results due to %d clients researching", clients_research);
- session_clear_set(se, sp);
- }
- else {
+ if (!clients_research || se->clients_starting)
+ {
// A new sorting based on same record set
- sr = nmem_malloc(se->nmem, sizeof(*sr));
+ struct reclist_sortparms *sr = nmem_malloc(se->nmem, sizeof(*sr));
sr->name = nmem_strdup(se->nmem, field);
sr->increasing = increasing;
sr->type = type;
sr->next = se->sorted_results;
se->sorted_results = sr;
- session_log(se, YLOG_DEBUG, "No research/ingesting done");
- return ;
+ session_log(se, YLOG_DEBUG, "session_sort: no research/ingesting done");
+ session_leave(se, "session_sort");
}
- session_log(se, YLOG_DEBUG, "Re- search/ingesting for clients due to change in sort order");
-
- for (l = se->clients_active; l; l = l->next)
+ else
{
- struct client *cl = l->client;
- if (client_get_state(cl) == Client_Connecting ||
- client_get_state(cl) == Client_Idle ||
- client_get_state(cl) == Client_Working) {
- client_start_search(cl);
- }
- else {
- yaz_log(YLOG_DEBUG, "Client %s: No re-start/ingest in show. Wrong client state: %d",
- client_get_id(cl), client_get_state(cl));
- }
+ se->clients_starting = 1;
+ session_log(se, YLOG_DEBUG,
+ "session_sort: reset results due to %d clients researching",
+ clients_research);
+ session_clear_set(se, sp);
+ session_log(se, YLOG_DEBUG, "Re- search/ingesting for clients due to change in sort order");
+ session_leave(se, "session_sort");
+ for (l = se->clients_active; l; l = l->next)
+ {
+ struct client *cl = l->client;
+ if (client_get_state(cl) == Client_Connecting ||
+ client_get_state(cl) == Client_Idle ||
+ client_get_state(cl) == Client_Working) {
+ client_start_search(cl);
+ }
+ else
+ {
+ session_log(se, YLOG_DEBUG,
+ "session_sort: %s: No re-start/ingest in show. "
+ "Wrong client state: %d",
+ client_get_id(cl), client_get_state(cl));
+ }
+ }
+ session_enter(se, "session_sort");
+ se->clients_starting = 0;
+ session_leave(se, "session_sort");
}
}
-void session_sort(struct session *se, struct reclist_sortparms *sp) {
- //session_enter(se, "session_sort");
- session_sort_unlocked(se, sp);
- //session_leave(se, "session_sort");
-}
+void session_stop(struct session *se)
+{
+ struct client_list *l;
+ session_enter(se, "session_stop1");
+ if (se->clients_starting)
+ {
+ session_leave(se, "session_stop1");
+ return;
+ }
+ se->clients_starting = 1;
+ session_leave(se, "session_stop1");
+ 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)
+ {
+ struct client *cl = l->client;
+ client_stop(cl);
+ }
+ session_enter(se, "session_stop2");
+ se->clients_starting = 0;
+ session_leave(se, "session_stop2");
+}
enum pazpar2_error_code session_search(struct session *se,
const char *query,
const char *filter,
const char *limit,
const char **addinfo,
- struct reclist_sortparms *sp)
+ const char **addinfo2,
+ struct reclist_sortparms *sp,
+ const char *mergekey,
+ const char *rank)
{
int live_channels = 0;
int no_working = 0;
int no_failed_query = 0;
int no_failed_limit = 0;
- struct client_list *l, *l0;
- int same_sort_order = 0;
+ 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);
}
session_enter(se, "session_search");
se->settings_modified = 0;
- if (se->sorted_results) {
- if (!reclist_sortparms_cmp(se->sorted_results, sp))
- same_sort_order = 1;
+ if (mergekey)
+ {
+ xfree(se->mergekey);
+ se->mergekey = *mergekey ? xstrdup(mergekey) : 0;
+ }
+ if (rank)
+ {
+ xfree(se->rank);
+ se->rank = *rank ? xstrdup(rank) : 0;
}
+
session_clear_set(se, sp);
relevance_destroy(&se->relevance);
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;
if (prepare_map(se, client_get_database(cl)) < 0)
continue;
- parse_ret = client_parse_query(cl, query, se->facet_limits);
+ parse_ret = client_parse_query(cl, query, se->facet_limits, addinfo2);
if (parse_ret == -1)
no_failed_query++;
else if (parse_ret == -2)
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)
else
return PAZPAR2_NO_TARGETS;
}
- session_log(se, YLOG_LOG, "session_start_search done");
return PAZPAR2_NO_ERROR;
}
// 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 *setting,
- 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 *new = nmem_malloc(se->session_nmem, sizeof(*new));
- int offset = settings_create_offset(service, setting);
-
- expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
- se->session_nmem);
- new->precedence = 0;
- new->target = dbname;
- new->name = setting;
- new->value = value;
- new->next = sdb->settings[offset];
- sdb->settings[offset] = new;
-
- se->settings_modified = 1;
-
- // Force later recompute of settings-driven data structures
- // (happens when a search starts and client connections are prepared)
- switch (offset)
- {
- case PZ_XSLT:
- if (sdb->map)
- {
+ 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 = 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;
}
- break;
+ s->value = nmem_strdup(se->session_nmem, value);
}
+ session_leave(se, "session_apply_setting");
}
void session_destroy(struct session *se)
{
struct session_database *sdb;
- session_log(se, YLOG_DEBUG, "Destroying");
+ session_log(se, YLOG_LOG, "destroy");
session_use(-1);
session_remove_cached_clients(se);
normalize_cache_destroy(se->normalize_cache);
relevance_destroy(&se->relevance);
reclist_destroy(se->reclist);
+ xfree(se->mergekey);
+ xfree(se->rank);
if (nmem_total(se->nmem))
session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem));
if (nmem_total(se->session_nmem))
session->total_records = 0;
session->number_of_warnings_unknown_elements = 0;
session->number_of_warnings_unknown_metadata = 0;
- session->num_termlists = 0;
- session->reclist = 0;
+ session->termlists = 0;
+ session->reclist = reclist_create(nmem);
session->clients_active = 0;
session->clients_cached = 0;
session->settings_modified = 0;
session->databases = 0;
session->sorted_results = 0;
session->facet_limits = 0;
+ session->mergekey = 0;
+ session->rank = 0;
+ session->clients_starting = 0;
for (i = 0; i <= SESSION_WATCH_MAX; i++)
{
session->normalize_cache = normalize_cache_create();
session->session_mutex = 0;
pazpar2_mutex_create(&session->session_mutex, tmp_str);
+ session_log(session, YLOG_LOG, "create");
+
session_use(1);
return session;
}
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);
void perform_termlist(struct http_channel *c, struct session *se,
const char *name, int num, int version)
{
- int i, j;
+ int j;
NMEM nmem_tmp = nmem_create();
char **names;
int num_names = 0;
const char *tname;
int must_generate_empty = 1; /* bug 5350 */
- for (i = 0; i < se->num_termlists; i++)
+ struct named_termlist *t = se->termlists;
+ for (; t; t = t->next)
{
- tname = se->termlists[i].name;
+ tname = t->name;
if (!strcmp(names[j], tname) || !strcmp(names[j], "*"))
{
struct termlist_score **p = 0;
wrbuf_puts(c->wrbuf, "\">\n");
must_generate_empty = 0;
- p = termlist_highscore(se->termlists[i].termlist, &len,
- nmem_tmp);
+ p = termlist_highscore(t->termlist, &len, nmem_tmp);
if (p)
{
int i;
session_enter(se, "show_single_start");
*prev_r = 0;
*next_r = 0;
- if (se->reclist)
- {
- reclist_limit(se->reclist, se);
+ reclist_limit(se->reclist, se, 1);
- reclist_enter(se->reclist);
- while ((r = reclist_read_record(se->reclist)))
+ reclist_enter(se->reclist);
+ while ((r = reclist_read_record(se->reclist)))
+ {
+ if (!strcmp(r->recid, id))
{
- if (!strcmp(r->recid, id))
- {
- *next_r = reclist_read_record(se->reclist);
- break;
- }
- *prev_r = r;
+ *next_r = reclist_read_record(se->reclist);
+ break;
}
- reclist_leave(se->reclist);
+ *prev_r = r;
}
+ reclist_leave(se->reclist);
if (!r)
session_leave(se, "show_single_start");
return r;
}
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
struct record_cluster **show_range_start(struct session *se,
struct reclist_sortparms *sp,
int start, int *num, int *total,
- Odr_int *sumhits, Odr_int *approx_hits)
+ Odr_int *sumhits, Odr_int *approx_hits,
+ void (*show_records_ready)(void *data),
+ struct http_channel *chan)
{
struct record_cluster **recs = 0;
struct reclist_sortparms *spp;
*sumhits = 0;
*approx_hits = 0;
*total = 0;
- reclist_limit(se->reclist, se);
+ reclist_limit(se->reclist, se, 0);
if (se->relevance)
{
for (spp = sp; spp; spp = spp->next)
- if (spp->type == Metadata_sortkey_relevance)
+ if (spp->type == Metadata_type_relevance)
{
relevance_prepare_read(se->relevance, se->reclist);
break;
reclist_enter(se->reclist);
*total = reclist_get_num_records(se->reclist);
+ for (l = se->clients_active; l; l = l->next)
+ client_update_show_stat(l->client, 0);
+
for (i = 0; i < start; i++)
- if (!reclist_read_record(se->reclist))
+ {
+ struct record_cluster *r = reclist_read_record(se->reclist);
+ if (!r)
{
*num = 0;
break;
}
-
- if (*num > 0)
- recs =
- nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *));
+ else
+ {
+ struct record *rec = r->records;
+ for (;rec; rec = rec->next)
+ client_update_show_stat(rec->client, 1);
+ }
+ }
+ recs = nmem_malloc(se->nmem, (*num > 0 ? *num : 1) * sizeof(*recs));
for (i = 0; i < *num; i++)
{
struct record_cluster *r = reclist_read_record(se->reclist);
*num = i;
break;
}
- recs[i] = r;
+ else
+ {
+ struct record *rec = r->records;
+ for (;rec; rec = rec->next)
+ client_update_show_stat(rec->client, 1);
+ recs[i] = r;
+ }
}
reclist_leave(se->reclist);
#if USE_TIMING
yaz_timing_stop(t);
- yaz_log(YLOG_LOG, "show %6.5f %3.2f %3.2f",
+ session_log(se, YLOG_LOG, "show %6.5f %3.2f %3.2f",
yaz_timing_get_real(t), yaz_timing_get_user(t),
yaz_timing_get_sys(t));
yaz_timing_destroy(&t);
#endif
+
+ if (!session_fetch_more(se))
+ session_log(se, YLOG_LOG, "can not fetch more");
+ else
+ {
+ show_range_stop(se, recs);
+ session_log(se, YLOG_LOG, "fetching more in progress");
+ if (session_set_watch(se, SESSION_WATCH_SHOW,
+ show_records_ready, chan, chan))
+ {
+ session_log(se, YLOG_WARN, "Ignoring show block");
+ session_enter(se, "show_range_start");
+ }
+ else
+ {
+ session_log(se, YLOG_LOG, "session watch OK");
+ return 0;
+ }
+ }
return recs;
}
{
if (attr->children && attr->children->content)
{
- if (strcmp((const char *) attr->name, "type"))
- { /* skip the "type" attribute.. Its value is already part of
- the element in output (md-%s) and so repeating it here
- is redundant */
+ if (strcmp((const char *) attr->name, "type")
+ && strcmp((const char *) attr->name, "empty"))
+ { /* skip the "type" + "empty" attribute..
+ The "Type" is already part of the element in output
+ (md-%s) and so repeating it here is redundant */
*attrp = nmem_malloc(nmem, sizeof(**attrp));
(*attrp)->name =
nmem_strdup(nmem, (const char *) attr->name);
}
*attrp = 0;
- if (type == Metadata_type_generic)
+ switch (type)
{
- char *p = nmem_strdup(nmem, value);
-
- p = normalize7bit_generic(p, " ,/.:([");
-
- rec_md->data.text.disp = p;
+ case Metadata_type_generic:
+ case Metadata_type_skiparticle:
+ if (strstr(value, "://")) /* looks like a URL */
+ rec_md->data.text.disp = nmem_strdup(nmem, value);
+ else
+ rec_md->data.text.disp =
+ normalize7bit_generic(nmem_strdup(nmem, value), " ,/.:([");
rec_md->data.text.sort = 0;
- }
- else if (type == Metadata_type_year || type == Metadata_type_date)
+ rec_md->data.text.snippet = 0;
+ break;
+ case Metadata_type_year:
+ case Metadata_type_date:
{
int first, last;
int longdate = 0;
rec_md->data.number.min = first;
rec_md->data.number.max = last;
}
- else
+ break;
+ case Metadata_type_float:
+ rec_md->data.fnumber = atof(value);
+ break;
+ case Metadata_type_relevance:
+ case Metadata_type_position:
return 0;
+ }
return rec_md;
}
+static void mergekey_norm_wr(pp2_charset_fact_t charsets,
+ WRBUF norm_wr, const char *value)
+{
+ const char *norm_str;
+ pp2_charset_token_t prt =
+ pp2_charset_token_create(charsets, "mergekey");
+
+ pp2_charset_token_first(prt, value, 0);
+ while ((norm_str = pp2_charset_token_next(prt)))
+ {
+ if (*norm_str)
+ {
+ if (wrbuf_len(norm_wr))
+ wrbuf_puts(norm_wr, " ");
+ wrbuf_puts(norm_wr, norm_str);
+ }
+ }
+ pp2_charset_token_destroy(prt);
+}
+
static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
struct conf_service *service, WRBUF norm_wr)
{
else if (!strcmp(name, (const char *) type))
{
xmlChar *value = xmlNodeListGetString(doc, n->children, 1);
- if (value)
+ if (value && *value)
{
- const char *norm_str;
- pp2_charset_token_t prt =
- pp2_charset_token_create(service->charsets, "mergekey");
-
- pp2_charset_token_first(prt, (const char *) value, 0);
if (wrbuf_len(norm_wr) > 0)
wrbuf_puts(norm_wr, " ");
wrbuf_puts(norm_wr, name);
- while ((norm_str =
- pp2_charset_token_next(prt)))
- {
- if (*norm_str)
- {
- wrbuf_puts(norm_wr, " ");
- wrbuf_puts(norm_wr, norm_str);
- }
- }
- xmlFree(value);
- pp2_charset_token_destroy(prt);
+ mergekey_norm_wr(service->charsets, norm_wr,
+ (const char *) value);
no_found++;
}
+ if (value)
+ xmlFree(value);
}
xmlFree(type);
}
return no_found;
}
-static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no,
- struct conf_service *service, NMEM nmem)
+static const char *get_mergekey(xmlDoc *doc, xmlNode *root,
+ struct client *cl, int record_no,
+ struct conf_service *service, NMEM nmem,
+ const char *session_mergekey)
{
char *mergekey_norm = 0;
- xmlNode *root = xmlDocGetRootElement(doc);
WRBUF norm_wr = wrbuf_alloc();
+ xmlChar *mergekey;
- /* consider mergekey from XSL first */
- xmlChar *mergekey = xmlGetProp(root, (xmlChar *) "mergekey");
- if (mergekey)
+ if (session_mergekey)
{
- const char *norm_str;
- pp2_charset_token_t prt =
- pp2_charset_token_create(service->charsets, "mergekey");
+ int i, num = 0;
+ char **values = 0;
+ nmem_strsplit_escape2(nmem, ",", session_mergekey, &values,
+ &num, 1, '\\', 1);
- pp2_charset_token_first(prt, (const char *) mergekey, 0);
- while ((norm_str = pp2_charset_token_next(prt)))
- {
- if (*norm_str)
- {
- if (wrbuf_len(norm_wr))
- wrbuf_puts(norm_wr, " ");
- wrbuf_puts(norm_wr, norm_str);
- }
- }
- pp2_charset_token_destroy(prt);
+ for (i = 0; i < num; i++)
+ get_mergekey_from_doc(doc, root, values[i], service, norm_wr);
+ }
+ else if ((mergekey = xmlGetProp(root, (xmlChar *) "mergekey")))
+ {
+ mergekey_norm_wr(service->charsets, norm_wr, (const char *) mergekey);
xmlFree(mergekey);
}
else
return match;
}
-
static int ingest_to_cluster(struct client *cl,
xmlDoc *xdoc,
xmlNode *root,
int record_no,
- const char *mergekey_norm);
+ struct record_metadata_attr *mergekey);
+
+static int ingest_sub_record(struct client *cl, xmlDoc *xdoc, xmlNode *root,
+ int record_no, NMEM nmem,
+ struct session_database *sdb,
+ struct record_metadata_attr *mergekeys)
+{
+ int ret = 0;
+ struct session *se = client_get_session(cl);
+
+ if (!check_record_filter(root, sdb))
+ {
+ session_log(se, YLOG_LOG,
+ "Filtered out record no %d from %s",
+ record_no, sdb->database->id);
+ return 0;
+ }
+ session_enter(se, "ingest_sub_record");
+ if (client_get_session(cl) == se && se->relevance)
+ ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekeys);
+ session_leave(se, "ingest_sub_record");
+
+ return ret;
+}
/** \brief ingest XML record
\param cl client holds the result set for record
int record_no, NMEM nmem)
{
struct session *se = client_get_session(cl);
- int ret = 0;
struct session_database *sdb = client_get_database(cl);
struct conf_service *service = se->service;
xmlDoc *xdoc = normalize_record(se, sdb, service, rec, nmem);
- xmlNode *root;
- const char *mergekey_norm;
+ 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 (global_parameters.dump_records)
+ {
+ session_log(se, YLOG_LOG, "Normalized record from %s",
+ sdb->database->id);
+ log_xml_doc(xdoc);
+ }
+
root = xmlDocGetRootElement(xdoc);
- if (!check_record_filter(root, sdb))
+ if (!strcmp((const char *) root->name, "cluster"))
{
- session_log(se, YLOG_LOG, "Filtered out record no %d from %s", record_no, sdb->database->id);
- xmlFreeDoc(xdoc);
- return -2;
+ int no_merge_keys = 0;
+ int no_merge_dups = 0;
+ xmlNode *sroot;
+ struct record_metadata_attr *mk = 0;
+
+ for (sroot = root->children; sroot; sroot = sroot->next)
+ if (sroot->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) sroot->name, "record"))
+ {
+ struct record_metadata_attr **mkp;
+ const char *mergekey_norm =
+ get_mergekey(xdoc, sroot, cl, record_no, service, nmem,
+ se->mergekey);
+ if (!mergekey_norm)
+ {
+ r = -1;
+ break;
+ }
+ for (mkp = &mk; *mkp; mkp = &(*mkp)->next)
+ if (!strcmp((*mkp)->value, mergekey_norm))
+ break;
+ if (!*mkp)
+ {
+ *mkp = (struct record_metadata_attr*)
+ nmem_malloc(nmem, sizeof(**mkp));
+ (*mkp)->name = 0;
+ (*mkp)->value = nmem_strdup(nmem, mergekey_norm);
+ (*mkp)->next = 0;
+ no_merge_keys++;
+ }
+ else
+ no_merge_dups++;
+ }
+ if (no_merge_keys > 1 || no_merge_dups > 0)
+ {
+ yaz_log(YLOG_LOG, "Got %d mergekeys, %d dups for position %d",
+ no_merge_keys, no_merge_dups, record_no);
+ }
+ for (sroot = root->children; !r && sroot; sroot = sroot->next)
+ 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);
+ }
}
-
- mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem);
- if (!mergekey_norm)
+ else if (!strcmp((const char *) root->name, "record"))
{
- session_log(se, YLOG_WARN, "Got no mergekey");
- xmlFreeDoc(xdoc);
- return -1;
+ const char *mergekey_norm =
+ get_mergekey(xdoc, root, cl, record_no, service, nmem,
+ se->mergekey);
+ if (mergekey_norm)
+ {
+ struct record_metadata_attr *mk = (struct record_metadata_attr*)
+ nmem_malloc(nmem, sizeof(*mk));
+ mk->name = 0;
+ 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);
+ }
}
- session_enter(se, "ingest_record");
- if (client_get_session(cl) == se)
- ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
- session_leave(se, "ingest_record");
-
- xmlFreeDoc(xdoc);
- return ret;
+ else
+ {
+ session_log(se, YLOG_WARN, "Bad pz root element: %s",
+ (const char *) root->name);
+ r = -1;
+ }
+ return r;
}
+
// struct conf_metadata *ser_md = &service->metadata[md_field_id];
// struct record_metadata *rec_md = record->metadata[md_field_id];
-static int match_metadata_local(struct conf_metadata *ser_md,
+static int match_metadata_local(struct conf_service *service,
+ struct conf_metadata *ser_md,
struct record_metadata *rec_md0,
char **values, int num_v)
{
int i;
struct record_metadata *rec_md = rec_md0;
+ WRBUF val_wr = 0;
+ WRBUF text_wr = wrbuf_alloc();
for (i = 0; i < num_v; )
{
if (rec_md)
}
else
{
- yaz_log(YLOG_DEBUG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
- if (!strcmp(rec_md->data.text.disp, values[i]))
+ if (!val_wr)
{
- // Value equals, should not be filtered.
- break;
+ val_wr = wrbuf_alloc();
+ mergekey_norm_wr(service->charsets, val_wr, values[i]);
}
+ wrbuf_rewind(text_wr);
+ mergekey_norm_wr(service->charsets, text_wr,
+ rec_md->data.text.disp);
+ if (!strcmp(wrbuf_cstr(val_wr), wrbuf_cstr(text_wr)))
+ break;
}
rec_md = rec_md->next;
}
else
{
rec_md = rec_md0;
+ wrbuf_destroy(val_wr);
+ val_wr = 0;
i++;
}
}
+ wrbuf_destroy(val_wr);
+ wrbuf_destroy(text_wr);
return i < num_v ? 1 : 0;
}
nmem_strsplit_escape2(nmem_tmp, "|", value, &values,
&num, 1, '\\', 1);
- if (!match_metadata_local(&service->metadata[md_field_id],
+ if (!match_metadata_local(service,
+ &service->metadata[md_field_id],
rec->metadata[md_field_id],
values, num))
{
md_field_id++)
{
if (match_metadata_local(
+ service,
&service->metadata[md_field_id],
record->metadata[md_field_id],
values, num_v))
break;
}
if (!match_metadata_local(
+ service,
&service->metadata[md_field_id],
record->metadata[md_field_id],
values, num_v))
xmlDoc *xdoc,
xmlNode *root,
int record_no,
- const char *mergekey_norm)
+ struct record_metadata_attr *merge_keys)
{
xmlNode *n;
xmlChar *type = 0;
struct record_cluster *cluster;
struct record_metadata **metadata0;
struct session_database *sdb = client_get_database(cl);
+ NMEM ingest_nmem = 0;
+ char **rank_values = 0;
+ int rank_num = 0;
struct record *record = record_create(se->nmem,
service->num_metadata,
service->num_sortkeys, cl,
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
-
- if (!type || !value || !*value)
+ if (!type)
continue;
-
+ if (!value || !*value)
+ {
+ xmlChar *empty = xmlGetProp(n, (xmlChar *) "empty");
+ if (!empty)
+ continue;
+ if (value)
+ xmlFree(value);
+ value = empty;
+ }
md_field_id
= conf_service_metadata_field_id(service, (const char *) type);
if (md_field_id < 0)
"for element '%s'", value, type);
continue;
}
+
+ if (ser_md->type == Metadata_type_generic)
+ {
+ WRBUF w = wrbuf_alloc();
+ if (relevance_snippet(se->relevance,
+ (char*) value, ser_md->name, w))
+ rec_md->data.text.snippet = nmem_strdup(se->nmem,
+ wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ }
+
+
wheretoput = &record->metadata[md_field_id];
while (*wheretoput)
wheretoput = &(*wheretoput)->next;
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)
xmlFree(value);
return -2;
}
- cluster = reclist_insert(se->reclist, service, record,
- mergekey_norm, &se->total_merged);
+ cluster = reclist_insert(se->reclist, se->relevance, service, record,
+ merge_keys, &se->total_merged);
if (!cluster)
- return -1;
+ {
+ if (type)
+ xmlFree(type);
+ if (value)
+ xmlFree(value);
+ return 0; // complete match with existing record
+ }
{
const char *use_term_factor_str =
int hits = (int) client_get_hits(cl);
term_factor = MAX(hits, maxrecs) / MAX(1, maxrecs);
assert(term_factor >= 1);
- yaz_log(YLOG_DEBUG, "Using term factor: %d (%d / %d)", term_factor, MAX(hits, maxrecs), MAX(1, maxrecs));
+ session_log(se, YLOG_DEBUG, "Using term factor: %d (%d / %d)",
+ term_factor, MAX(hits, maxrecs), MAX(1, maxrecs));
}
}
session_log(se, YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
sdb->database->id, record_no);
-
- relevance_newrec(se->relevance, cluster);
-
// original metadata, to check if first existence of a field
metadata0 = xmalloc(sizeof(*metadata0) * service->num_metadata);
memcpy(metadata0, cluster->metadata,
sizeof(*metadata0) * service->num_metadata);
+ ingest_nmem = nmem_create();
+ if (se->rank)
+ {
+ yaz_log(YLOG_LOG, "local in sort : %s", se->rank);
+ nmem_strsplit_escape2(ingest_nmem, ",", se->rank, &rank_values,
+ &rank_num, 1, '\\', 1);
+ }
+
// now parsing XML record and adding data to cluster or record metadata
for (n = root->children; n; n = n->next)
{
- pp2_charset_token_t prt;
if (type)
xmlFree(type);
if (value)
struct record_metadata *rec_md = 0;
int md_field_id = -1;
int sk_field_id = -1;
- const char *rank;
- xmlChar *xml_rank;
+ const char *rank = 0;
+ xmlChar *xml_rank = 0;
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
if (!rec_md)
continue;
- xml_rank = xmlGetProp(n, (xmlChar *) "rank");
- rank = xml_rank ? (const char *) xml_rank : ser_md->rank;
+ if (rank_num)
+ {
+ int i;
+ for (i = 0; i < rank_num; i++)
+ {
+ const char *val = rank_values[i];
+ const char *cp = strchr(val, '=');
+ if (!cp)
+ continue;
+ if ((cp - val) == strlen((const char *) type)
+ && !memcmp(val, type, cp - val))
+ {
+ rank = cp + 1;
+ break;
+ }
+ }
+ }
+ else
+ {
+ xml_rank = xmlGetProp(n, (xmlChar *) "rank");
+ rank = xml_rank ? (const char *) xml_rank : ser_md->rank;
+ }
wheretoput = &cluster->metadata[md_field_id];
*wheretoput = rec_md;
if (ser_sk)
{
+ pp2_charset_token_t prt;
const char *sort_str = 0;
int skip_article =
- ser_sk->type == Metadata_sortkey_skiparticle;
+ ser_sk->type == Metadata_type_skiparticle;
if (!cluster->sortkeys[sk_field_id])
cluster->sortkeys[sk_field_id] =
relevance_countwords(se->relevance, cluster,
(char *) value, rank, ser_md->name);
}
-
// construct facets ... unless the client already has reported them
if (ser_md->termlist && !client_has_facet(cl, (char *) type))
{
if (value)
xmlFree(value);
+ nmem_destroy(ingest_nmem);
xfree(metadata0);
relevance_donerecord(se->relevance, cluster);
se->total_records++;
va_start(ap, fmt);
yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
- yaz_log(level, "Session %u: %s", s->session_id, buf);
+ yaz_log(level, "Session %u: %s", s ? s->session_id : 0, buf);
va_end(ap);
}
projects / pazpar2-moved-to-github.git / blobdiff