/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 2006-2011 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
#include <signal.h>
#include <ctype.h>
#include <assert.h>
+#include <math.h>
#include <yaz/marcdisp.h>
#include <yaz/comstack.h>
#define MAX_CHUNK 15
+#define MAX(a,b) ((a)>(b)?(a):(b))
+
// Note: Some things in this structure will eventually move to configuration
struct parameters global_parameters =
{
void add_facet(struct session *s, const char *type, const char *value, int count)
{
- int i;
-
- if (!*value)
- return;
- for (i = 0; i < s->num_termlists; i++)
- if (!strcmp(s->termlists[i].name, type))
- break;
- if (i == s->num_termlists)
+ struct conf_service *service = s->service;
+ pp2_relevance_token_t prt;
+ const char *facet_component;
+ WRBUF facet_wrbuf = wrbuf_alloc();
+ prt = pp2_relevance_tokenize(service->facet_pct);
+
+ pp2_relevance_first(prt, value, 0);
+ while ((facet_component = pp2_relevance_token_next(prt)))
{
- if (i == SESSION_MAX_TERMLISTS)
+ if (*facet_component)
{
- yaz_log(YLOG_FATAL, "Too many termlists");
- return;
+ if (wrbuf_len(facet_wrbuf))
+ wrbuf_puts(facet_wrbuf, " ");
+ wrbuf_puts(facet_wrbuf, facet_component);
}
-
- s->termlists[i].name = nmem_strdup(s->nmem, type);
- s->termlists[i].termlist
- = termlist_create(s->nmem, TERMLIST_HIGH_SCORE);
- s->num_termlists = i + 1;
}
- yaz_log(YLOG_DEBUG, "Session: facets for %s: %s (%d)", type, value, count);
-
- termlist_insert(s->termlists[i].termlist, value, count);
+ pp2_relevance_token_destroy(prt);
+
+ if (wrbuf_len(facet_wrbuf))
+ {
+ int i;
+ for (i = 0; i < s->num_termlists; i++)
+ if (!strcmp(s->termlists[i].name, type))
+ break;
+ if (i == s->num_termlists)
+ {
+ if (i == SESSION_MAX_TERMLISTS)
+ {
+ session_log(s, YLOG_FATAL, "Too many termlists");
+ wrbuf_destroy(facet_wrbuf);
+ return;
+ }
+
+ s->termlists[i].name = nmem_strdup(s->nmem, type);
+ s->termlists[i].termlist
+ = termlist_create(s->nmem, TERMLIST_HIGH_SCORE);
+ s->num_termlists = i + 1;
+ }
+
+ session_log(s, YLOG_DEBUG, "Session: facets for %s: %s norm:%s (%d)",
+ type, value, wrbuf_cstr(facet_wrbuf), count);
+ termlist_insert(s->termlists[i].termlist, wrbuf_cstr(facet_wrbuf),
+ count);
+ }
+ wrbuf_destroy(facet_wrbuf);
}
-static xmlDoc *record_to_xml(struct session_database *sdb, const char *rec)
+static xmlDoc *record_to_xml(struct session *se,
+ struct session_database *sdb, const char *rec)
{
struct database *db = sdb->database;
xmlDoc *rdoc = 0;
if (!rdoc)
{
- yaz_log(YLOG_FATAL, "Non-wellformed XML received from %s",
- db->url);
+ session_log(se, YLOG_FATAL, "Non-wellformed XML received from %s",
+ db->url);
return 0;
}
if (global_parameters.dump_records)
{
- yaz_log(YLOG_LOG, "Un-normalized record from %s", db->url);
+ session_log(se, YLOG_LOG, "Un-normalized record from %s", db->url);
log_xml_doc(rdoc);
}
}
}
-static xmlDoc *normalize_record(struct session_database *sdb,
+static xmlDoc *normalize_record(struct session *se,
+ struct session_database *sdb,
struct conf_service *service,
const char *rec, NMEM nmem)
{
- xmlDoc *rdoc = record_to_xml(sdb, rec);
+ xmlDoc *rdoc = record_to_xml(se, sdb, rec);
if (rdoc)
{
if (normalize_record_transform(sdb->map, &rdoc, (const char **)parms))
{
- yaz_log(YLOG_WARN, "Normalize failed from %s", sdb->database->url);
+ session_log(se, YLOG_WARN, "Normalize failed from %s",
+ sdb->database->url);
}
else
{
if (global_parameters.dump_records)
{
- yaz_log(YLOG_LOG, "Normalized record from %s",
- sdb->database->url);
+ session_log(se, YLOG_LOG, "Normalized record from %s",
+ sdb->database->url);
log_xml_doc(rdoc);
}
}
if (!sdb->settings)
{
- yaz_log(YLOG_WARN, "No settings on %s", sdb->database->url);
+ session_log(se, YLOG_WARN, "No settings on %s", sdb->database->url);
return -1;
}
if ((s = session_setting_oneval(sdb, PZ_XSLT)))
}
else
{
- yaz_log(YLOG_WARN, "No pz:requestsyntax for auto stylesheet");
+ session_log(se, YLOG_WARN,
+ "No pz:requestsyntax for auto stylesheet");
}
}
sdb->map = normalize_cache_get(se->normalize_cache,
{
if (!sdb->settings)
{
- yaz_log(YLOG_WARN,
+ session_log(se, YLOG_WARN,
"No settings associated with %s", sdb->database->url);
return -1;
}
session_watchfun fun;
http_remove_observer(s->watchlist[what].obs);
- fun = s->watchlist[what].fun;
+ fun = s->watchlist[what].fun;
data = s->watchlist[what].data;
/* reset watch before fun is invoked - in case fun wants to set
s->watchlist[what].obs = 0;
session_leave(s);
+ session_log(s, YLOG_DEBUG,
+ "session_alert_watch: %d calling function: %p", what, fun);
fun(data);
}
else
return res;
}
+int session_is_preferred_clients_ready(struct session *s)
+{
+ struct client_list *l;
+ int res = 0;
+
+ for (l = s->clients; l; l = l->next)
+ if (client_is_active_preferred(l->client))
+ res++;
+ session_log(s, YLOG_DEBUG, "Session has %d active preferred clients.", res);
+ return res == 0;
+}
+
+
enum pazpar2_error_code search(struct session *se,
const char *query,
struct client_list *l;
struct timeval tval;
- yaz_log(YLOG_DEBUG, "Search");
+ session_log(se, YLOG_DEBUG, "Search");
*addinfo = 0;
{
struct session_database *sdb;
- yaz_log(YLOG_DEBUG, "%p Pazpar2 session destroy", se);
+ session_log(se, YLOG_DEBUG, "Pazpar2 session destroy");
session_remove_clients(se);
for (sdb = se->databases; sdb; sdb = sdb->next)
}
struct session *new_session(NMEM nmem, struct conf_service *service,
- const char *name)
+ unsigned session_id)
{
int i;
struct session *session = nmem_malloc(nmem, sizeof(*session));
- yaz_log(YLOG_DEBUG, "%p New Pazpar2 session", session);
+ char tmp_str[50];
+
+ sprintf(tmp_str, "session#%u", session_id);
+ session->session_id = session_id;
+ session_log(session, YLOG_DEBUG, "New session");
session->service = service;
session->relevance = 0;
session->total_hits = 0;
}
session->normalize_cache = normalize_cache_create();
session->session_mutex = 0;
- pazpar2_mutex_create_flag(&session->session_mutex, name, PTHREAD_MUTEX_RECURSIVE);
+ pazpar2_mutex_create(&session->session_mutex, tmp_str);
return session;
}
struct record_cluster **prev_r,
struct record_cluster **next_r)
{
- struct record_cluster *r;
+ struct record_cluster *r = 0;
session_enter(se);
- reclist_enter(se->reclist);
*prev_r = 0;
*next_r = 0;
- while ((r = reclist_read_record(se->reclist)))
+ if (se->reclist)
{
- if (!strcmp(r->recid, id))
+ reclist_enter(se->reclist);
+ while ((r = reclist_read_record(se->reclist)))
{
- *next_r = reclist_read_record(se->reclist);
- break;
+ if (!strcmp(r->recid, id))
+ {
+ *next_r = reclist_read_record(se->reclist);
+ break;
+ }
+ *prev_r = r;
}
- *prev_r = r;
+ reclist_leave(se->reclist);
}
- reclist_leave(se->reclist);
if (!r)
session_leave(se);
return r;
if (type)
{
size_t len;
- const char *eq = strchr(s, '~');
- if (eq)
- len = eq - s;
+ int substring;
+ const char *eq;
+
+ if ((eq = strchr(s, '=')))
+ substring = 0;
+ else if ((eq = strchr(s, '~')))
+ substring = 1;
+ if (eq)
+ len = eq - s;
else
len = strlen(s);
if (len == strlen((const char *)type) &&
xmlChar *value = xmlNodeGetContent(n);
if (value && *value)
{
- if (!eq || strstr((const char *) value, eq+1))
+ if (!eq ||
+ (substring && strstr((const char *) value, eq+1)) ||
+ (!substring && !strcmp((const char *) value, eq + 1)))
match = 1;
}
xmlFree(value);
int ret = 0;
struct session_database *sdb = client_get_database(cl);
struct conf_service *service = se->service;
- xmlDoc *xdoc = normalize_record(sdb, service, rec, nmem);
+ xmlDoc *xdoc = normalize_record(se, sdb, service, rec, nmem);
xmlNode *root;
const char *mergekey_norm;
if (!check_record_filter(root, sdb))
{
- yaz_log(YLOG_WARN, "Filtered out record no %d from %s", record_no,
- sdb->database->url);
+ session_log(se, YLOG_WARN, "Filtered out record no %d from %s",
+ record_no, sdb->database->url);
xmlFreeDoc(xdoc);
return -1;
}
mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem);
if (!mergekey_norm)
{
- yaz_log(YLOG_WARN, "Got no mergekey");
+ session_log(se, YLOG_WARN, "Got no mergekey");
xmlFreeDoc(xdoc);
return -1;
}
record,
mergekey_norm,
&se->total_merged);
+
+ const char *use_term_factor_str = session_setting_oneval(sdb, PZ_TERMLIST_TERM_FACTOR);
+ int use_term_factor = 1;
+ // HACK: default to use term factor.
+ int term_factor = 1;
+ if (use_term_factor_str && use_term_factor_str[0] != 0)
+ use_term_factor = atoi(use_term_factor_str);
+ if (use_term_factor) {
+ int maxrecs = client_get_maxrecs(cl);
+ 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 ", term_factor);
+ }
+
if (!cluster)
return -1;
if (global_parameters.dump_records)
- yaz_log(YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
- sdb->database->url, record_no);
+ session_log(se, 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
{
if (se->number_of_warnings_unknown_metadata == 0)
{
- yaz_log(YLOG_WARN,
+ session_log(se, YLOG_WARN,
"Ignoring unknown metadata element: %s", type);
}
se->number_of_warnings_unknown_metadata++;
ser_md->type, n->properties);
if (!rec_md)
{
- yaz_log(YLOG_WARN, "bad metadata data '%s' for element '%s'",
- value, type);
+ session_log(se, YLOG_WARN, "bad metadata data '%s' "
+ "for element '%s'", value, type);
continue;
}
wheretoput = &record->metadata[md_field_id];
if (!sort_str)
{
sort_str = rec_md->data.text.disp;
- yaz_log(YLOG_WARN,
+ session_log(se, YLOG_WARN,
"Could not make sortkey. Bug #1858");
}
cluster->sortkeys[sk_field_id]->text.sort =
nmem_strdup(se->nmem, sort_str);
-#if 0
- yaz_log(YLOG_LOG, "text disp=%s",
- cluster->sortkeys[sk_field_id]->text.disp);
- yaz_log(YLOG_LOG, "text sort=%s",
- cluster->sortkeys[sk_field_id]->text.sort);
-#endif
pp2_relevance_token_destroy(prt);
}
}
{
char year[64];
sprintf(year, "%d", rec_md->data.number.max);
- add_facet(se, (char *) type, year, 1);
+
+ add_facet(se, (char *) type, year, term_factor);
if (rec_md->data.number.max != rec_md->data.number.min)
{
sprintf(year, "%d", rec_md->data.number.min);
- add_facet(se, (char *) type, year, 1);
+ add_facet(se, (char *) type, year, term_factor);
}
}
else
- add_facet(se, (char *) type, (char *) value, 1);
+ add_facet(se, (char *) type, (char *) value, term_factor);
}
// cleaning up
else
{
if (se->number_of_warnings_unknown_elements == 0)
- yaz_log(YLOG_WARN,
+ session_log(se, YLOG_WARN,
"Unexpected element in internal record: %s", n->name);
se->number_of_warnings_unknown_elements++;
}
return 0;
}
+void session_log(struct session *s, int level, const char *fmt, ...)
+{
+ char buf[1024];
+ va_list ap;
+ va_start(ap, fmt);
+
+ yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
+ yaz_log(level, "%u %s", s->session_id, buf);
+
+ va_end(ap);
+}
+
/*
* Local variables:
* c-basic-offset: 4