X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=21a47294f11bd0133a8d3598ac830b9406dca1b3;hb=873be84689528ca10a1ded3dd4bbda24b6916882;hp=2700caf513c41be7d43bd3c1c5886fbf013f3137;hpb=0c6a54300925eab30a58a09b80661bfc8118d11f;p=pazpar2-moved-to-github.git
diff --git a/src/session.c b/src/session.c
index 2700caf..21a4729 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,5 +1,5 @@
/* 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
@@ -86,7 +86,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
struct parameters global_parameters =
{
0, // dump_records
- 0 // debug_mode
+ 0, // debug_mode
+ 0, // predictable sessions
};
struct client_list {
@@ -94,6 +95,48 @@ struct client_list {
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;
+static int no_session_total = 0;
+
+static int session_use(int delta)
+{
+ int sessions;
+ if (!g_session_mutex)
+ 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);
+ return sessions;
+}
+
+int sessions_count(void)
+{
+ 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();
@@ -122,53 +165,50 @@ static void session_leave(struct session *s)
yaz_mutex_leave(s->session_mutex);
}
-// Recursively traverse query structure to extract terms.
-void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num)
-{
- char **words;
- int numwords;
- int i;
-
- switch (n->kind)
- {
- case CCL_RPN_AND:
- case CCL_RPN_OR:
- case CCL_RPN_NOT:
- case CCL_RPN_PROX:
- pull_terms(nmem, n->u.p[0], termlist, num);
- pull_terms(nmem, n->u.p[1], termlist, num);
- break;
- case CCL_RPN_TERM:
- nmem_strsplit(nmem, " ", n->u.t.term, &words, &numwords);
- for (i = 0; i < numwords; i++)
- termlist[(*num)++] = words[i];
- break;
- default: // NOOP
- break;
- }
-}
-
-
void add_facet(struct session *s, const char *type, const char *value, int count)
{
struct conf_service *service = s->service;
- pp2_relevance_token_t prt;
+ pp2_charset_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)))
+ WRBUF display_wrbuf = wrbuf_alloc();
+ 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);
+ 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;
+ }
+ 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);
}
+ display_component = pp2_get_display(prt);
+ if (display_component)
+ {
+ if (wrbuf_len(display_wrbuf))
+ wrbuf_puts(display_wrbuf, " ");
+ wrbuf_puts(display_wrbuf, display_component);
+ }
}
- pp2_relevance_token_destroy(prt);
-
+ pp2_charset_token_destroy(prt);
+
if (wrbuf_len(facet_wrbuf))
{
int i;
@@ -181,6 +221,7 @@ void add_facet(struct session *s, const char *type, const char *value, int count
{
session_log(s, YLOG_FATAL, "Too many termlists");
wrbuf_destroy(facet_wrbuf);
+ wrbuf_destroy(display_wrbuf);
return;
}
@@ -190,12 +231,14 @@ void add_facet(struct session *s, const char *type, const char *value, int count
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);
+#if 0
+ session_log(s, YLOG_DEBUG, "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),
+ wrbuf_cstr(facet_wrbuf), count);
}
wrbuf_destroy(facet_wrbuf);
+ wrbuf_destroy(display_wrbuf);
}
static xmlDoc *record_to_xml(struct session *se,
@@ -209,13 +252,13 @@ static xmlDoc *record_to_xml(struct session *se,
if (!rdoc)
{
session_log(se, YLOG_FATAL, "Non-wellformed XML received from %s",
- db->url);
+ db->id);
return 0;
}
if (global_parameters.dump_records)
{
- session_log(se, YLOG_LOG, "Un-normalized record from %s", db->url);
+ session_log(se, YLOG_LOG, "Un-normalized record from %s", db->id);
log_xml_doc(rdoc);
}
@@ -303,7 +346,7 @@ static xmlDoc *normalize_record(struct session *se,
if (normalize_record_transform(sdb->map, &rdoc, (const char **)parms))
{
session_log(se, YLOG_WARN, "Normalize failed from %s",
- sdb->database->url);
+ sdb->database->id);
}
else
{
@@ -312,7 +355,7 @@ static xmlDoc *normalize_record(struct session *se,
if (global_parameters.dump_records)
{
session_log(se, YLOG_LOG, "Normalized record from %s",
- sdb->database->url);
+ sdb->database->id);
log_xml_doc(rdoc);
}
}
@@ -364,7 +407,7 @@ static int prepare_map(struct session *se, struct session_database *sdb)
if (!sdb->settings)
{
- session_log(se, YLOG_WARN, "No settings on %s", sdb->database->url);
+ session_log(se, YLOG_WARN, "No settings on %s", sdb->database->id);
return -1;
}
if ((s = session_setting_oneval(sdb, PZ_XSLT)))
@@ -395,7 +438,7 @@ static int prepare_map(struct session *se, struct session_database *sdb)
}
}
sdb->map = normalize_cache_get(se->normalize_cache,
- se->service->server->config, s);
+ se->service, s);
if (!sdb->map)
return -1;
}
@@ -410,7 +453,7 @@ static int prepare_session_database(struct session *se,
if (!sdb->settings)
{
session_log(se, YLOG_WARN,
- "No settings associated with %s", sdb->database->url);
+ "No settings associated with %s", sdb->database->id);
return -1;
}
if (sdb->settings[PZ_XSLT] && !sdb->map)
@@ -451,7 +494,7 @@ int session_set_watch(struct session *s, int what,
ret = 0;
}
session_leave(s);
- return 0;
+ return ret;
}
void session_alert_watch(struct session *s, int what)
@@ -476,7 +519,7 @@ void session_alert_watch(struct session *s, int what)
session_leave(s);
session_log(s, YLOG_DEBUG,
- "session_alert_watch: %d calling function: %p", what, fun);
+ "Alert Watch: %d calling function: %p", what, fun);
fun(data);
}
else
@@ -484,14 +527,16 @@ void session_alert_watch(struct session *s, int what)
}
//callback for grep_databases
-static void select_targets_callback(void *context, struct session_database *db)
+static void select_targets_callback(struct session *se,
+ struct session_database *db)
{
- struct session *se = (struct session*) context;
- struct client *cl = client_create();
+ struct client *cl = client_create(db->database->id);
struct client_list *l;
+
client_set_database(cl, db);
client_set_session(cl, se);
+
l = xmalloc(sizeof(*l));
l->client = cl;
l->next = se->clients;
@@ -548,23 +593,95 @@ int session_is_preferred_clients_ready(struct session *s)
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);
+ session_log(s, YLOG_DEBUG, "Has %d active preferred clients.", res);
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;
+ struct client_list *l;
+ session_enter(se);
+
+ /* see if we already have sorted for this critieria */
+ for (sr = se->sorted_results; sr; sr = sr->next)
+ {
+ if (!strcmp(field, sr->field) && increasing == sr->increasing)
+ break;
+ }
+ if (sr)
+ {
+ yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d already fetched",
+ field, increasing);
+ session_leave(se);
+ return;
+ }
+ yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d must fetch",
+ field, increasing);
+ sr = nmem_malloc(se->nmem, sizeof(*sr));
+ sr->field = nmem_strdup(se->nmem, field);
+ sr->increasing = increasing;
+ sr->next = se->sorted_results;
+ se->sorted_results = sr;
+
+ for (l = se->clients; 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);
+ }
+ }
+ session_leave(se);
+}
-enum pazpar2_error_code search(struct session *se,
- const char *query,
- const char *startrecs, const char *maxrecs,
- const char *filter,
- const char **addinfo)
+enum pazpar2_error_code session_search(struct session *se,
+ const char *query,
+ const char *startrecs,
+ const char *maxrecs,
+ const char *filter,
+ const char *limit,
+ const char **addinfo,
+ const char *sort_field, int increasing)
{
int live_channels = 0;
int no_working = 0;
int no_failed = 0;
struct client_list *l;
struct timeval tval;
+ facet_limits_t facet_limits;
session_log(se, YLOG_DEBUG, "Search");
@@ -577,8 +694,15 @@ enum pazpar2_error_code search(struct session *se,
se->reclist = 0;
relevance_destroy(&se->relevance);
nmem_reset(se->nmem);
- se->total_records = se->total_hits = se->total_merged = 0;
+ se->total_records = se->total_merged = 0;
se->num_termlists = 0;
+
+ /* reset list of sorted results and clear to relevance search */
+ se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results));
+ se->sorted_results->field = nmem_strdup(se->nmem, sort_field);
+ se->sorted_results->increasing = increasing;
+ se->sorted_results->next = 0;
+
live_channels = select_targets(se, filter);
if (!live_channels)
{
@@ -591,9 +715,17 @@ enum pazpar2_error_code search(struct session *se,
tval.tv_sec += 5;
+ facet_limits = facet_limits_create(limit);
+ if (!facet_limits)
+ {
+ *addinfo = "limit";
+ session_leave(se);
+ return PAZPAR2_MALFORMED_PARAMETER_VALUE;
+ }
for (l = se->clients; l; l = l->next)
{
struct client *cl = l->client;
+ const char *strategy_plus_sort = get_strategy_plus_sort(cl, sort_field);
if (maxrecs)
client_set_maxrecs(cl, atoi(maxrecs));
@@ -601,7 +733,7 @@ enum pazpar2_error_code search(struct session *se,
client_set_startrecs(cl, atoi(startrecs));
if (prepare_session_database(se, client_get_database(cl)) < 0)
;
- else if (client_parse_query(cl, query) < 0)
+ else if (client_parse_query(cl, query, facet_limits) < 0)
no_failed++;
else
{
@@ -610,9 +742,10 @@ enum pazpar2_error_code search(struct session *se,
se->service->z3950_session_timeout,
se->service->server->iochan_man,
&tval))
- client_start_search(cl);
+ client_start_search(cl, strategy_plus_sort, increasing);
}
}
+ facet_limits_destroy(facet_limits);
session_leave(se);
if (no_working == 0)
{
@@ -671,8 +804,6 @@ static struct session_database *load_session_database(struct session *se,
{
struct database *db = new_database(id, se->session_nmem);
- resolve_database(se->service, db);
-
session_init_databases_fun((void*) se, db);
// New sdb is head of se->databases list
@@ -686,7 +817,7 @@ static struct session_database *find_session_database(struct session *se,
struct session_database *sdb;
for (sdb = se->databases; sdb; sdb = sdb->next)
- if (!strcmp(sdb->database->url, id))
+ if (!strcmp(sdb->database->id, id))
return sdb;
return load_session_database(se, id);
}
@@ -722,11 +853,10 @@ void session_apply_setting(struct session *se, char *dbname, char *setting,
}
}
-void destroy_session(struct session *se)
-{
+void session_destroy(struct session *se) {
struct session_database *sdb;
-
- session_log(se, YLOG_DEBUG, "Pazpar2 session destroy");
+ session_log(se, YLOG_DEBUG, "Destroying");
+ session_use(-1);
session_remove_clients(se);
for (sdb = se->databases; sdb; sdb = sdb->next)
@@ -737,9 +867,19 @@ void destroy_session(struct session *se)
nmem_destroy(se->nmem);
service_destroy(se->service);
yaz_mutex_destroy(&se->session_mutex);
- wrbuf_destroy(se->wrbuf);
}
+size_t session_get_memory_status(struct session *session) {
+ size_t session_nmem;
+ if (session == 0)
+ return 0;
+ session_enter(session);
+ session_nmem = nmem_total(session->nmem);
+ session_leave(session);
+ return session_nmem;
+}
+
+
struct session *new_session(NMEM nmem, struct conf_service *service,
unsigned session_id)
{
@@ -751,10 +891,9 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
sprintf(tmp_str, "session#%u", session_id);
session->session_id = session_id;
- session_log(session, YLOG_DEBUG, "New session");
+ session_log(session, YLOG_DEBUG, "New");
session->service = service;
session->relevance = 0;
- session->total_hits = 0;
session->total_records = 0;
session->number_of_warnings_unknown_elements = 0;
session->number_of_warnings_unknown_metadata = 0;
@@ -763,7 +902,6 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
session->clients = 0;
session->session_nmem = nmem;
session->nmem = nmem_create();
- session->wrbuf = wrbuf_alloc();
session->databases = 0;
for (i = 0; i <= SESSION_WATCH_MAX; i++)
{
@@ -773,17 +911,19 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
session->normalize_cache = normalize_cache_create();
session->session_mutex = 0;
pazpar2_mutex_create(&session->session_mutex, tmp_str);
-
+ session_use(1);
return session;
}
-struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem)
+const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf);
+
+static struct hitsbytarget *hitsbytarget_nb(struct session *se,
+ int *count, NMEM nmem)
{
struct hitsbytarget *res = 0;
struct client_list *l;
size_t sz = 0;
- session_enter(se);
for (l = se->clients; l; l = l->next)
sz++;
@@ -796,7 +936,7 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem)
const char *name = session_setting_oneval(client_get_database(cl),
PZ_NAME);
- res[*count].id = client_get_database(cl)->database->url;
+ res[*count].id = client_get_id(cl);
res[*count].name = *name ? name : "Unknown";
res[*count].hits = client_get_hits(cl);
res[*count].records = client_get_num_records(cl);
@@ -804,14 +944,27 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem)
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);
- res[*count].settings_xml = w;
+ res[*count].settings_xml = nmem_strdup(nmem, wrbuf_cstr(w));
+ wrbuf_rewind(w);
+ wrbuf_puts(w, "");
+ res[*count].suggestions_xml = nmem_strdup(nmem, client_get_suggestions_xml(cl, w));
+ wrbuf_destroy(w);
(*count)++;
}
- session_leave(se);
return res;
}
-struct termlist_score **termlist(struct session *se, const char *name, int *num)
+struct hitsbytarget *get_hitsbytarget(struct session *se, int *count, NMEM nmem)
+{
+ struct hitsbytarget *p;
+ session_enter(se);
+ p = hitsbytarget_nb(se, count, nmem);
+ session_leave(se);
+ return p;
+}
+
+struct termlist_score **get_termlist_score(struct session *se,
+ const char *name, int *num)
{
int i;
struct termlist_score **tl = 0;
@@ -827,6 +980,116 @@ struct termlist_score **termlist(struct session *se, const char *name, int *num)
return tl;
}
+// Compares two hitsbytarget nodes by hitcount
+static int cmp_ht(const void *p1, const void *p2)
+{
+ const struct hitsbytarget *h1 = p1;
+ const struct hitsbytarget *h2 = p2;
+ return h2->hits - h1->hits;
+}
+
+static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
+ NMEM nmem)
+{
+ struct hitsbytarget *ht;
+ int count, i;
+
+ ht = hitsbytarget_nb(se, &count, nmem);
+ qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
+ for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
+ {
+
+ // do only print terms which have display names
+
+ wrbuf_puts(wrbuf, "\n");
+
+ wrbuf_puts(wrbuf, "");
+ wrbuf_xmlputs(wrbuf, ht[i].id);
+ wrbuf_puts(wrbuf, "\n");
+
+ wrbuf_puts(wrbuf, "");
+ if (!ht[i].name || !ht[i].name[0])
+ wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
+ else
+ wrbuf_xmlputs(wrbuf, ht[i].name);
+ wrbuf_puts(wrbuf, "\n");
+
+ wrbuf_printf(wrbuf, "" ODR_INT_PRINTF "\n",
+ ht[i].hits);
+
+ wrbuf_puts(wrbuf, "");
+ wrbuf_xmlputs(wrbuf, ht[i].state);
+ wrbuf_puts(wrbuf, "\n");
+
+ wrbuf_printf(wrbuf, "%d\n",
+ ht[i].diagnostic);
+ wrbuf_puts(wrbuf, "\n");
+ }
+ return count;
+}
+
+void perform_termlist(struct http_channel *c, struct session *se,
+ const char *name, int num)
+{
+ int i, j;
+ NMEM nmem_tmp = nmem_create();
+ char **names;
+ int num_names = 0;
+
+ if (name)
+ nmem_strsplit(nmem_tmp, ",", name, &names, &num_names);
+
+ session_enter(se);
+
+ for (j = 0; j < num_names; j++)
+ {
+ const char *tname;
+
+ wrbuf_puts(c->wrbuf, "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))
+ {
+ struct termlist_score **p = 0;
+ int len;
+ p = termlist_highscore(se->termlists[i].termlist, &len);
+ if (p)
+ {
+ int i;
+ for (i = 0; i < len && i < num; i++)
+ {
+ // prevent sending empty term elements
+ if (!p[i]->display_term || !p[i]->display_term[0])
+ continue;
+
+ wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, "");
+ wrbuf_xmlputs(c->wrbuf, p[i]->display_term);
+ wrbuf_puts(c->wrbuf, "");
+
+ wrbuf_printf(c->wrbuf,
+ "%d",
+ p[i]->frequency);
+ wrbuf_puts(c->wrbuf, "\n");
+ }
+ }
+ }
+ }
+ tname = "xtargets";
+ if (num_names > 0 && !strcmp(names[j], tname))
+ {
+ targets_termlist_nb(c->wrbuf, se, num, c->nmem);
+ }
+ wrbuf_puts(c->wrbuf, "
\n");
+ }
+ session_leave(se);
+ nmem_destroy(nmem_tmp);
+}
+
#ifdef MISSING_HEADERS
void report_nmem_stats(void)
{
@@ -844,22 +1107,25 @@ struct record_cluster *show_single_start(struct session *se, const char *id,
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;
@@ -891,6 +1157,8 @@ struct record_cluster **show_range_start(struct session *se,
}
else
{
+ struct client_list *l;
+
for (spp = sp; spp; spp = spp->next)
if (spp->type == Metadata_sortkey_relevance)
{
@@ -901,7 +1169,10 @@ struct record_cluster **show_range_start(struct session *se,
reclist_enter(se->reclist);
*total = reclist_get_num_records(se->reclist);
- *sumhits = se->total_hits;
+
+ *sumhits = 0;
+ for (l = se->clients; l; l = l->next)
+ *sumhits += client_get_hits(l->client);
for (i = 0; i < start; i++)
if (!reclist_read_record(se->reclist))
@@ -944,11 +1215,13 @@ void statistics(struct session *se, struct statistics *stat)
int count = 0;
memset(stat, 0, sizeof(*stat));
+ stat->num_hits = 0;
for (l = se->clients; l; l = l->next)
{
struct client *cl = l->client;
if (!client_get_connection(cl))
stat->num_no_connection++;
+ stat->num_hits += client_get_hits(cl);
switch (client_get_state(cl))
{
case Client_Connecting: stat->num_connecting++; break;
@@ -960,7 +1233,6 @@ void statistics(struct session *se, struct statistics *stat)
}
count++;
}
- stat->num_hits = se->total_hits;
stat->num_records = se->total_records;
stat->num_clients = count;
@@ -1040,15 +1312,15 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
if (value)
{
const char *norm_str;
- pp2_relevance_token_t prt =
- pp2_relevance_tokenize(service->mergekey_pct);
+ pp2_charset_token_t prt =
+ pp2_charset_token_create(service->charsets, "mergekey");
- pp2_relevance_first(prt, (const char *) value, 0);
+ 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_relevance_token_next(prt)))
+ pp2_charset_token_next(prt)))
{
if (*norm_str)
{
@@ -1057,7 +1329,7 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name,
}
}
xmlFree(value);
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
no_found++;
}
}
@@ -1079,11 +1351,11 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no,
if (mergekey)
{
const char *norm_str;
- pp2_relevance_token_t prt =
- pp2_relevance_tokenize(service->mergekey_pct);
+ pp2_charset_token_t prt =
+ pp2_charset_token_create(service->charsets, "mergekey");
- pp2_relevance_first(prt, (const char *) mergekey, 0);
- while ((norm_str = pp2_relevance_token_next(prt)))
+ pp2_charset_token_first(prt, (const char *) mergekey, 0);
+ while ((norm_str = pp2_charset_token_next(prt)))
{
if (*norm_str)
{
@@ -1092,7 +1364,7 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no,
wrbuf_puts(norm_wr, norm_str);
}
}
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
xmlFree(mergekey);
}
else
@@ -1120,8 +1392,13 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no,
/* generate unique key if none is not generated already or is empty */
if (wrbuf_len(norm_wr) == 0)
{
- wrbuf_printf(norm_wr, "%s-%d",
- client_get_database(cl)->database->url, record_no);
+ wrbuf_printf(norm_wr, "position: %s-%d",
+ client_get_id(cl), record_no);
+ }
+ else
+ {
+ const char *lead = "content: ";
+ wrbuf_insert(norm_wr, 0, lead, strlen(lead));
}
if (wrbuf_len(norm_wr) > 0)
mergekey_norm = nmem_strdup(nmem, wrbuf_cstr(norm_wr));
@@ -1204,6 +1481,7 @@ static int ingest_to_cluster(struct client *cl,
\param nmem working NMEM
\retval 0 OK
\retval -1 failure
+ \retval -2 Filtered
*/
int ingest_record(struct client *cl, const char *rec,
int record_no, NMEM nmem)
@@ -1223,10 +1501,10 @@ int ingest_record(struct client *cl, const char *rec,
if (!check_record_filter(root, sdb))
{
- session_log(se, YLOG_WARN, "Filtered out record no %d from %s",
- record_no, sdb->database->url);
+ session_log(se, YLOG_LOG, "Filtered out record no %d from %s",
+ record_no, sdb->database->id);
xmlFreeDoc(xdoc);
- return -1;
+ return -2;
}
mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem);
@@ -1238,7 +1516,7 @@ int ingest_record(struct client *cl, const char *rec,
}
session_enter(se);
if (client_get_session(cl) == se)
- ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
+ ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
session_leave(se);
xmlFreeDoc(xdoc);
@@ -1254,44 +1532,18 @@ static int ingest_to_cluster(struct client *cl,
xmlNode *n;
xmlChar *type = 0;
xmlChar *value = 0;
- struct session_database *sdb = client_get_database(cl);
struct session *se = client_get_session(cl);
struct conf_service *service = se->service;
+ int term_factor = 1;
+ struct record_cluster *cluster;
+ struct session_database *sdb = client_get_database(cl);
struct record *record = record_create(se->nmem,
service->num_metadata,
service->num_sortkeys, cl,
record_no);
- struct record_cluster *cluster = reclist_insert(se->reclist,
- service,
- 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;
- int term_factor = 1;
- if (use_term_factor_str)
- 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)
- 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
for (n = root->children; n; n = n->next)
{
- pp2_relevance_token_t prt;
if (type)
xmlFree(type);
if (value)
@@ -1303,11 +1555,9 @@ static int ingest_to_cluster(struct client *cl,
if (!strcmp((const char *) n->name, "metadata"))
{
struct conf_metadata *ser_md = 0;
- struct conf_sortkey *ser_sk = 0;
struct record_metadata **wheretoput = 0;
struct record_metadata *rec_md = 0;
int md_field_id = -1;
- int sk_field_id = -1;
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
@@ -1327,13 +1577,8 @@ static int ingest_to_cluster(struct client *cl,
se->number_of_warnings_unknown_metadata++;
continue;
}
-
+
ser_md = &service->metadata[md_field_id];
-
- if (ser_md->sortkey_offset >= 0){
- sk_field_id = ser_md->sortkey_offset;
- ser_sk = &service->sortkeys[sk_field_id];
- }
// non-merged metadata
rec_md = record_metadata_init(se->nmem, (const char *) value,
@@ -1348,26 +1593,95 @@ static int ingest_to_cluster(struct client *cl,
while (*wheretoput)
wheretoput = &(*wheretoput)->next;
*wheretoput = rec_md;
+ }
+ }
+
+ cluster = reclist_insert(se->reclist, service, record,
+ mergekey_norm, &se->total_merged);
+ if (!cluster)
+ return -1;
+
+ {
+ const char *use_term_factor_str =
+ session_setting_oneval(sdb, PZ_TERMLIST_TERM_FACTOR);
+ if (use_term_factor_str && use_term_factor_str[0] == '1')
+ {
+ 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 (%d / %d)", term_factor, MAX(hits, maxrecs), MAX(1, maxrecs));
+ }
+ }
+
+ if (global_parameters.dump_records)
+ session_log(se, YLOG_LOG, "Cluster id %s from %s (#%d)", cluster->recid,
+ sdb->database->id, record_no);
+
+
+ relevance_newrec(se->relevance, cluster);
+
+ // 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)
+ xmlFree(value);
+ type = value = 0;
+
+ if (n->type != XML_ELEMENT_NODE)
+ continue;
+ if (!strcmp((const char *) n->name, "metadata"))
+ {
+ struct conf_metadata *ser_md = 0;
+ struct conf_sortkey *ser_sk = 0;
+ struct record_metadata **wheretoput = 0;
+ struct record_metadata *rec_md = 0;
+ int md_field_id = -1;
+ int sk_field_id = -1;
+
+ type = xmlGetProp(n, (xmlChar *) "type");
+ value = xmlNodeListGetString(xdoc, n->children, 1);
+
+ if (!type || !value || !*value)
+ continue;
+
+ md_field_id
+ = conf_service_metadata_field_id(service, (const char *) type);
+ if (md_field_id < 0)
+ continue;
+
+ ser_md = &service->metadata[md_field_id];
+
+ if (ser_md->sortkey_offset >= 0)
+ {
+ sk_field_id = ser_md->sortkey_offset;
+ ser_sk = &service->sortkeys[sk_field_id];
+ }
// merged metadata
rec_md = record_metadata_init(se->nmem, (const char *) value,
ser_md->type, 0);
+ if (!rec_md)
+ continue;
+
wheretoput = &cluster->metadata[md_field_id];
// and polulate with data:
// assign cluster or record based on merge action
if (ser_md->merge == Metadata_merge_unique)
{
- struct record_metadata *mnode;
- for (mnode = *wheretoput; mnode; mnode = mnode->next)
- if (!strcmp((const char *) mnode->data.text.disp,
+ while (*wheretoput)
+ {
+ if (!strcmp((const char *) (*wheretoput)->data.text.disp,
rec_md->data.text.disp))
break;
- if (!mnode)
- {
- rec_md->next = *wheretoput;
- *wheretoput = rec_md;
+ wheretoput = &(*wheretoput)->next;
}
+ if (!*wheretoput)
+ *wheretoput = rec_md;
}
else if (ser_md->merge == Metadata_merge_longest)
{
@@ -1387,12 +1701,13 @@ static int ingest_to_cluster(struct client *cl,
nmem_malloc(se->nmem,
sizeof(union data_types));
- prt = pp2_relevance_tokenize(service->sort_pct);
+ prt =
+ pp2_charset_token_create(service->charsets, "sort");
- pp2_relevance_first(prt, rec_md->data.text.disp,
- skip_article);
+ pp2_charset_token_first(prt, rec_md->data.text.disp,
+ skip_article);
- pp2_relevance_token_next(prt);
+ pp2_charset_token_next(prt);
sort_str = pp2_get_sort(prt);
@@ -1406,13 +1721,14 @@ static int ingest_to_cluster(struct client *cl,
}
cluster->sortkeys[sk_field_id]->text.sort =
nmem_strdup(se->nmem, sort_str);
- pp2_relevance_token_destroy(prt);
+ pp2_charset_token_destroy(prt);
}
}
}
else if (ser_md->merge == Metadata_merge_all)
{
- rec_md->next = *wheretoput;
+ while (*wheretoput)
+ wheretoput = &(*wheretoput)->next;
*wheretoput = rec_md;
}
else if (ser_md->merge == Metadata_merge_range)
@@ -1445,7 +1761,6 @@ static int ingest_to_cluster(struct client *cl,
// construct facets ... unless the client already has reported them
if (ser_md->termlist && !client_has_facet(cl, (char *) type))
{
-
if (ser_md->type == Metadata_type_year)
{
char year[64];
@@ -1493,7 +1808,7 @@ void session_log(struct session *s, int level, const char *fmt, ...)
va_start(ap, fmt);
yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
- yaz_log(level, "%u %s", s->session_id, buf);
+ yaz_log(level, "Session (%u): %s", s->session_id, buf);
va_end(ap);
}