/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) 2006-2012 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
struct client_list *next;
};
-struct session_sorted_results {
- const char *field;
- int increasing;
- struct session_sorted_results *next;
-};
-
/* session counting (1) , disable client counting (0) */
static YAZ_MUTEX g_session_mutex = 0;
static int no_sessions = 0;
yaz_mutex_leave(s->session_mutex);
}
-void add_facet(struct session *s, const char *type, const char *value, int count)
+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;
pp2_charset_token_t prt;
const char *facet_component;
- WRBUF facet_wrbuf = wrbuf_alloc();
- WRBUF display_wrbuf = wrbuf_alloc();
int i;
const char *icu_chain_id = 0;
}
}
pp2_charset_token_destroy(prt);
+}
+
+void add_facet(struct session *s, const char *type, const char *value, int count)
+{
+ WRBUF facet_wrbuf = wrbuf_alloc();
+ WRBUF display_wrbuf = wrbuf_alloc();
+
+ session_normalize_facet(s, type, value, display_wrbuf, facet_wrbuf);
if (wrbuf_len(facet_wrbuf))
{
{
cl = client_create(db->database->id);
client_set_database(cl, db);
- client_set_session(cl, se);
l = xmalloc(sizeof(*l));
l->client = cl;
l->next = se->clients_cached;
se->clients_cached = l;
}
+ /* set session always. If may be 0 if client is not active */
+ client_set_session(cl, se);
l = xmalloc(sizeof(*l));
l->client = cl;
while (l)
{
struct client_list *l_next = l->next;
+
+ client_lock(l->client);
+ client_set_session(l->client, 0); /* mark client inactive */
+ client_unlock(l->client);
+
xfree(l);
l = l_next;
}
return res == 0;
}
-static const char *get_strategy_plus_sort(struct client *l, const char *field)
-{
- struct session_database *sdb = client_get_database(l);
- struct setting *s;
-
- const char *strategy_plus_sort = 0;
-
- for (s = sdb->settings[PZ_SORTMAP]; s; s = s->next)
- {
- char *p = strchr(s->name + 3, ':');
- if (!p)
- {
- yaz_log(YLOG_WARN, "Malformed sortmap name: %s", s->name);
- continue;
- }
- p++;
- if (!strcmp(p, field))
- {
- strategy_plus_sort = s->value;
- break;
- }
- }
- return strategy_plus_sort;
-}
-
void session_sort(struct session *se, const char *field, int increasing)
{
struct session_sorted_results *sr;
for (l = se->clients_active; l; l = l->next)
{
struct client *cl = l->client;
- const char *strategy_plus_sort = get_strategy_plus_sort(cl, field);
- if (strategy_plus_sort)
- {
- struct timeval tval;
- if (client_prep_connection(cl, se->service->z3950_operation_timeout,
- se->service->z3950_session_timeout,
- se->service->server->iochan_man,
- &tval))
- client_start_search(cl, strategy_plus_sort, increasing);
- }
+ if (client_get_state(cl) == Client_Connecting ||
+ client_get_state(cl) == Client_Idle ||
+ client_get_state(cl) == Client_Working)
+ client_start_search(cl);
}
session_leave(se);
}
{
int live_channels = 0;
int no_working = 0;
- int no_failed = 0;
+ int no_failed_query = 0;
+ int no_failed_limit = 0;
struct client_list *l, *l0;
struct timeval tval;
facet_limits_t facet_limits;
{
int parse_ret;
struct client *cl = l->client;
- const char *strategy_plus_sort = get_strategy_plus_sort(cl, sort_field);
if (prepare_map(se, client_get_database(cl)) < 0)
continue;
parse_ret = client_parse_query(cl, query, facet_limits, startrecs,
maxrecs);
- if (parse_ret < 0)
- no_failed++;
- else if (parse_ret == 0)
- {
- session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl));
- no_working++;
- if (client_prep_connection(cl, se->service->z3950_operation_timeout,
- se->service->z3950_session_timeout,
- se->service->server->iochan_man,
- &tval))
- client_start_search(cl, strategy_plus_sort, increasing);
- }
+ if (parse_ret == -1)
+ no_failed_query++;
+ else if (parse_ret == -2)
+ no_failed_limit++;
else
{
- session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl));
- no_working++;
- if (client_prep_connection(cl, se->service->z3950_operation_timeout,
+ int r =
+ client_prep_connection(cl, se->service->z3950_operation_timeout,
se->service->z3950_session_timeout,
se->service->server->iochan_man,
- &tval))
+ &tval);
+ if (parse_ret == 1 && r == 2)
{
+ session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl));
client_reingest(cl);
}
+ else if (r)
+ {
+ session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl));
+ client_start_search(cl);
+ }
+ no_working++;
}
}
facet_limits_destroy(facet_limits);
if (no_working == 0)
{
- if (no_failed > 0)
+ if (no_failed_query > 0)
{
*addinfo = "query";
return PAZPAR2_MALFORMED_PARAMETER_VALUE;
}
+ else if (no_failed_limit > 0)
+ {
+ *addinfo = "limit";
+ return PAZPAR2_MALFORMED_PARAMETER_VALUE;
+ }
else
return PAZPAR2_NO_TARGETS;
}
res[*count].name = *name ? name : "Unknown";
res[*count].hits = client_get_hits(cl);
res[*count].records = client_get_num_records(cl);
- res[*count].diagnostic = client_get_diagnostic(cl);
+ res[*count].diagnostic =
+ client_get_diagnostic(cl, &res[*count].addinfo);
res[*count].state = client_get_state_str(cl);
res[*count].connected = client_get_connection(cl) ? 1 : 0;
session_settings_dump(se, client_get_database(cl), w);
char **names;
int num_names = 0;
- if (name)
- nmem_strsplit(nmem_tmp, ",", name, &names, &num_names);
+ if (!name)
+ name = "*";
+
+ nmem_strsplit(nmem_tmp, ",", name, &names, &num_names);
session_enter(se);
{
const char *tname;
- wrbuf_puts(c->wrbuf, "<list name=\"");
- wrbuf_xmlputs(c->wrbuf, names[j]);
- wrbuf_puts(c->wrbuf, "\">\n");
-
for (i = 0; i < se->num_termlists; i++)
{
tname = se->termlists[i].name;
- if (num_names > 0 && !strcmp(names[j], tname))
+ if (!strcmp(names[j], tname) || !strcmp(names[j], "*"))
{
struct termlist_score **p = 0;
int len;
+
+ wrbuf_puts(c->wrbuf, "<list name=\"");
+ wrbuf_xmlputs(c->wrbuf, tname);
+ wrbuf_puts(c->wrbuf, "\">\n");
+
p = termlist_highscore(se->termlists[i].termlist, &len);
if (p)
{
wrbuf_puts(c->wrbuf, "</term>\n");
}
}
+ wrbuf_puts(c->wrbuf, "</list>\n");
}
}
tname = "xtargets";
- if (num_names > 0 && !strcmp(names[j], tname))
+ if (!strcmp(names[j], tname) || !strcmp(names[j], "*"))
{
+ wrbuf_puts(c->wrbuf, "<list name=\"");
+ wrbuf_xmlputs(c->wrbuf, tname);
+ wrbuf_puts(c->wrbuf, "\">\n");
+
targets_termlist_nb(c->wrbuf, se, num, c->nmem);
+ wrbuf_puts(c->wrbuf, "</list>\n");
}
- wrbuf_puts(c->wrbuf, "</list>\n");
}
session_leave(se);
nmem_destroy(nmem_tmp);
}
session_enter(se);
if (client_get_session(cl) == se)
- ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
+ ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
session_leave(se);
xmlFreeDoc(xdoc);
return ret;
}
+static int check_limit_local(struct client *cl,
+ struct record *record,
+ int record_no)
+{
+ int skip_record = 0;
+ struct session *se = client_get_session(cl);
+ struct conf_service *service = se->service;
+ NMEM nmem_tmp = nmem_create();
+ struct session_database *sdb = client_get_database(cl);
+ int l = 0;
+ while (!skip_record)
+ {
+ struct conf_metadata *ser_md = 0;
+ struct record_metadata *rec_md = 0;
+ int md_field_id;
+ char **values = 0;
+ int i, num_v = 0;
+
+ const char *name =
+ client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v,
+ &values);
+ if (!name)
+ break;
+
+ md_field_id = conf_service_metadata_field_id(service, name);
+ if (md_field_id < 0)
+ {
+ skip_record = 1;
+ break;
+ }
+ ser_md = &service->metadata[md_field_id];
+ rec_md = record->metadata[md_field_id];
+ yaz_log(YLOG_LOG, "check limit local %s", name);
+ for (i = 0; i < num_v; )
+ {
+ if (rec_md)
+ {
+ if (ser_md->type == Metadata_type_year
+ || ser_md->type == Metadata_type_date)
+ {
+ int y = atoi(values[i]);
+ if (y >= rec_md->data.number.min
+ && y <= rec_md->data.number.max)
+ break;
+ }
+ else
+ {
+ yaz_log(YLOG_LOG, "cmp: '%s' '%s'",
+ rec_md->data.text.disp, values[i]);
+ if (!strcmp(rec_md->data.text.disp, values[i]))
+ {
+ break;
+ }
+ }
+ rec_md = rec_md->next;
+ }
+ else
+ {
+ rec_md = record->metadata[md_field_id];
+ i++;
+ }
+ }
+ if (i == num_v)
+ {
+ skip_record = 1;
+ break;
+ }
+ }
+ nmem_destroy(nmem_tmp);
+ return skip_record;
+}
+
static int ingest_to_cluster(struct client *cl,
xmlDoc *xdoc,
xmlNode *root,
}
}
+ 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);
if (!cluster)
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->session_id, buf);
va_end(ap);
}
projects / pazpar2-moved-to-github.git / blobdiff