#include <yaz/timing.h>
#endif
+#include "ppmutex.h"
#include "parameters.h"
#include "session.h"
#include "eventl.h"
void session_alert_watch(struct session *s, int what)
{
+ assert(s);
session_enter(s);
if (s->watchlist[what].fun)
{
client_set_session(cl, se);
}
+static void session_remove_clients(struct session *se)
+{
+ struct client *cl = se->clients;
+ while (cl)
+ {
+ struct client *cl_next = client_next_in_session(cl);
+ client_remove_from_session(cl);
+ client_destroy(cl);
+ cl = cl_next;
+ }
+ se->clients = 0;
+}
+
// Associates a set of clients with a session;
// Note: Session-databases represent databases with per-session
// setting overrides
static int select_targets(struct session *se, const char *filter)
{
- while (se->clients)
- client_destroy(se->clients);
-
+ session_remove_clients(se);
return session_grep_databases(se, filter, select_targets_callback);
}
*addinfo = 0;
session_enter(se);
- nmem_reset(se->nmem);
- se->relevance = 0;
- se->total_records = se->total_hits = se->total_merged = 0;
reclist_destroy(se->reclist);
se->reclist = 0;
+ nmem_reset(se->nmem);
+ relevance_destroy(&se->relevance);
+ se->total_records = se->total_hits = se->total_merged = 0;
se->num_termlists = 0;
live_channels = select_targets(se, filter);
if (!live_channels)
{
struct session_database *sdb;
- while (s->clients)
- client_destroy(s->clients);
+ session_remove_clients(s);
+
for (sdb = s->databases; sdb; sdb = sdb->next)
session_database_destroy(sdb);
normalize_cache_destroy(s->normalize_cache);
+ relevance_destroy(&s->relevance);
reclist_destroy(s->reclist);
nmem_destroy(s->nmem);
service_destroy(s->service);
wrbuf_destroy(s->wrbuf);
}
-struct session *new_session(NMEM nmem, struct conf_service *service)
+struct session *new_session(NMEM nmem, struct conf_service *service,
+ const char *name)
{
int i;
struct session *session = nmem_malloc(nmem, sizeof(*session));
}
session->normalize_cache = normalize_cache_create();
session->mutex = 0;
- yaz_mutex_create(&session->mutex);
+
+ pazpar2_mutex_create(&session->mutex, name);
return session;
}
{
const char *norm_str;
pp2_relevance_token_t prt =
- pp2_relevance_tokenize(
- service->mergekey_pct,
- (const char *) value, 0);
+ pp2_relevance_tokenize(service->mergekey_pct);
+ pp2_relevance_first(prt, (const char *) value, 0);
if (wrbuf_len(norm_wr) > 0)
wrbuf_puts(norm_wr, " ");
wrbuf_puts(norm_wr, name);
{
const char *norm_str;
pp2_relevance_token_t prt =
- pp2_relevance_tokenize(
- service->mergekey_pct,
- (const char *) mergekey, 0);
-
+ pp2_relevance_tokenize(service->mergekey_pct);
+
+ pp2_relevance_first(prt, (const char *) mergekey, 0);
while ((norm_str = pp2_relevance_token_next(prt)))
{
if (*norm_str)
int ingest_record(struct client *cl, const char *rec,
int record_no, NMEM nmem)
{
- struct session_database *sdb = client_get_database(cl);
struct session *se = client_get_session(cl);
+ int ret;
+ struct session_database *sdb = client_get_database(cl);
struct conf_service *service = se->service;
xmlDoc *xdoc = normalize_record(sdb, service, rec, nmem);
xmlNode *root;
const char *mergekey_norm;
- int ret;
-
+
if (!xdoc)
return -1;
-
+
root = xmlDocGetRootElement(xdoc);
-
+
if (!check_record_filter(root, sdb))
{
yaz_log(YLOG_WARN, "Filtered out record no %d from %s", record_no,
- sdb->database->url);
+ sdb->database->url);
xmlFreeDoc(xdoc);
return -1;
}
-
+
mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem);
if (!mergekey_norm)
{
session_enter(se);
ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
session_leave(se);
-
+
xmlFreeDoc(xdoc);
-
return ret;
}
nmem_malloc(se->nmem,
sizeof(union data_types));
- prt = pp2_relevance_tokenize(
- service->sort_pct,
- rec_md->data.text.disp, skip_article);
+ prt = pp2_relevance_tokenize(service->sort_pct);
+
+ pp2_relevance_first(prt, rec_md->data.text.disp,
+ skip_article);
pp2_relevance_token_next(prt);