#if HAVE_CONFIG_H
#include <config.h>
#endif
-#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
yaz_mutex_enter(g_mutex);
no_clients += delta;
yaz_mutex_leave(g_mutex);
- yaz_log(YLOG_LOG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
+ yaz_log(YLOG_DEBUG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
}
#else
#define client_use(x)
int diagnostic;
enum client_state state;
struct show_raw *show_raw;
- struct client *next; // next client in session or next in free list
ZOOM_resultset resultset;
YAZ_MUTEX mutex;
int ref_count;
cl->state = st;
/* no need to check for all client being non-active if this one
already is. Note that session_active_clients also LOCKS session */
-#if 0
if (!client_is_active(cl) && cl->session)
{
int no_active = session_active_clients(cl->session);
if (no_active == 0)
session_alert_watch(cl->session, SESSION_WATCH_SHOW);
}
-#endif
}
static void client_show_raw_error(struct client *cl, const char *addinfo);
void client_got_records(struct client *cl)
{
- if (cl->session)
+ struct session *se = cl->session;
+ if (se)
{
- session_alert_watch(cl->session, SESSION_WATCH_SHOW);
- session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+ client_unlock(cl);
+ session_alert_watch(se, SESSION_WATCH_SHOW);
+ session_alert_watch(se, SESSION_WATCH_RECORD);
+ client_lock(cl);
}
}
}
}
+static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
+ int index = 0;
+ struct session_database *sdb = client_get_database(cl);
+ const char *opt_facet_term_sort = session_setting_oneval(sdb, PZ_TERMLIST_TERM_SORT);
+ const char *opt_facet_term_count = session_setting_oneval(sdb, PZ_TERMLIST_TERM_COUNT);
+ struct session *session = client_get_session(cl);
+ struct conf_service *service = session->service;
+ int num = service->num_metadata;
+ WRBUF wrbuf = wrbuf_alloc();
+ int first = 1;
+ for (index = 0; index < num; index++) {
+ struct conf_metadata *conf_meta = &service->metadata[index];
+ if (conf_meta->termlist) {
+ if (first)
+ first = 0;
+ else
+ wrbuf_puts(wrbuf, ",");
+ wrbuf_printf(wrbuf, "@attr 1=%s ", conf_meta->name);
+
+ if (opt_facet_term_sort && opt_facet_term_sort[0] != '\0') {
+ wrbuf_printf(wrbuf, " 2=%s ", opt_facet_term_sort);
+ }
+ if (opt_facet_term_count && opt_facet_term_count[0] != '\0') {
+ wrbuf_printf(wrbuf, " 3=%s ", opt_facet_term_count);
+ }
+ }
+ }
+ if (wrbuf_len(wrbuf)) {
+ yaz_log(YLOG_LOG, "Setting ZOOM facets option: %s", wrbuf_cstr(wrbuf));
+ ZOOM_connection_option_set(link, "facets", wrbuf_cstr(wrbuf));
+ return 1;
+ }
+ return 0;
+}
+
+int client_has_facet(struct client *cl, const char *name) {
+ ZOOM_facet_field facet_field;
+ if (!cl || !cl->resultset || !name)
+ return 0;
+ facet_field = ZOOM_resultset_get_facet_field(cl->resultset, name);
+ if (facet_field)
+ return 1;
+ return 0;
+}
+
+/**
+ * TODO Consider thread safety!!!
+ *
+ */
+int client_report_facets(struct client *cl, ZOOM_resultset rs) {
+ int facet_idx;
+ ZOOM_facet_field *facets = ZOOM_resultset_facets(rs);
+ struct session *se = client_get_session(cl);
+
+ int facet_num = ZOOM_resultset_facets_size(rs);
+ for (facet_idx = 0; facet_idx < facet_num; facet_idx++) {
+ const char *name = ZOOM_facet_field_name(facets[facet_idx]);
+ size_t term_idx;
+ size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
+ for (term_idx = 0; term_idx < term_num; term_idx++ ) {
+ int freq;
+ const char *term = ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
+ if (term)
+ add_facet(se, name, term, freq);
+ }
+ }
+
+ return 0;
+}
+
void client_start_search(struct client *cl)
{
struct session_database *sdb = client_get_database(cl);
ZOOM_query q = ZOOM_query_create();
yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery);
ZOOM_query_cql(q, cl->cqlquery);
- if (*opt_sort)
- ZOOM_query_sortby(q, opt_sort);
+ if (*opt_sort)
+ ZOOM_query_sortby(q, opt_sort);
rs = ZOOM_connection_search(link, q);
ZOOM_query_destroy(q);
}
else
{
+ int has_facets = client_set_facets_request(cl, link);
yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
rs = ZOOM_connection_search_pqf(link, cl->pquery);
+ if (has_facets)
+ client_report_facets(cl, rs);
}
ZOOM_resultset_destroy(cl->resultset);
cl->resultset = rs;
r->state = Client_Disconnected;
r->show_raw = 0;
r->resultset = 0;
- r->next = 0;
r->mutex = 0;
pazpar2_mutex_create(&r->mutex, "client");
return r;
}
+void client_lock(struct client *c)
+{
+ yaz_mutex_enter(c->mutex);
+}
+
+void client_unlock(struct client *c)
+{
+ yaz_mutex_leave(c->mutex);
+}
+
void client_incref(struct client *c)
{
pazpar2_incref(&c->ref_count, c->mutex);
- yaz_log(YLOG_LOG, "client_incref c=%p %s cnt=%d",
+ yaz_log(YLOG_DEBUG, "client_incref c=%p %s cnt=%d",
c, client_get_url(c), c->ref_count);
}
{
if (c)
{
- yaz_log(YLOG_LOG, "client_destroy c=%p %s cnt=%d",
+ yaz_log(YLOG_DEBUG, "client_destroy c=%p %s cnt=%d",
c, client_get_url(c), c->ref_count);
if (!pazpar2_decref(&c->ref_count, c->mutex))
{
- c->next = 0;
xfree(c->pquery);
c->pquery = 0;
xfree(c->cqlquery);
c->cqlquery = 0;
assert(!c->connection);
- assert(!c->resultset);
-
+
+ if (c->resultset)
+ {
+ ZOOM_resultset_destroy(c->resultset);
+ }
yaz_mutex_destroy(&c->mutex);
xfree(c);
client_use(-1);
void client_set_connection(struct client *cl, struct connection *con)
{
if (cl->resultset)
- {
- ZOOM_resultset_destroy(cl->resultset);
- cl->resultset = 0;
- }
+ ZOOM_resultset_release(cl->resultset);
if (con)
{
assert(cl->connection == 0);
else
cl->cqlquery = 0;
+ /* TODO FIX Not thread safe */
if (!se->relevance)
{
// Initialize relevance structure with query terms
return 0;
}
-
-void client_remove_from_session(struct client *c)
-{
- struct session *se;
-
- se = c->session;
- assert(se);
- if (se)
- {
- struct client **ccp = &se->clients;
-
- while (*ccp && *ccp != c)
- ccp = &(*ccp)->next;
- assert(*ccp == c);
- *ccp = c->next;
-
- c->database = 0;
- c->session = 0;
- c->next = 0;
- }
-}
-
void client_set_session(struct client *cl, struct session *se)
{
cl->session = se;
- cl->next = se->clients;
- se->clients = cl;
}
int client_is_active(struct client *cl)
return 0;
}
-struct client *client_next_in_session(struct client *cl)
-{
- if (cl)
- return cl->next;
- return 0;
-
-}
-
Odr_int client_get_hits(struct client *cl)
{
return cl->hits;
projects / pazpar2-moved-to-github.git / blobdiff