X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=6df84b28f183f639cae7bd7f39ab0baec40c7471;hb=f4141adedff2fa6c97243d19623a1bd879c5aee2;hp=064754a59b347879bdc980e022a1aa9eff1c8dc6;hpb=3d39722ae64c21a6d5833ec667ef9fd2fb66913f;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 064754a..6df84b2 100644 --- a/src/client.c +++ b/src/client.c @@ -136,17 +136,19 @@ enum client_state client_get_state(struct client *cl) void client_set_state(struct client *cl, enum client_state st) { + int was_active = 0; + if (client_is_active(cl)) + was_active = 1; 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) + /* If client is going from being active to inactive and all clients + are now idle we fire a watch for the session . The assumption is + that session is not mutex locked if client is already active */ + if (was_active && !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); @@ -393,6 +395,33 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, } } +/** + * 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); + int facet_num; + struct session *se = client_get_session(cl); + facet_num = ZOOM_resultset_facets_size(rs); + yaz_log(YLOG_DEBUG, "client_report_facets: %d", facet_num); + + 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; +} + static void ingest_raw_record(struct client *cl, ZOOM_record rec) { const char *buf; @@ -418,6 +447,7 @@ void client_search_response(struct client *cl) struct session *se = cl->session; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; + const char *error, *addinfo = 0; if (ZOOM_connection_error(link, &error, &addinfo)) @@ -429,6 +459,7 @@ void client_search_response(struct client *cl) } else { + client_report_facets(cl, resultset); cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); if (se) @@ -525,6 +556,64 @@ void client_record_response(struct client *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); + /* Disable when no count is set */ + if (opt_facet_term_count == 0 || opt_facet_term_count[0] == '\0') { + yaz_log(YLOG_LOG, "Resetting ZOOM facets option to empty."); + ZOOM_connection_option_set(link, "facets", ""); + return 0; + } + 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; + yaz_log(YLOG_DEBUG, "Facet settings, sort: %s count: %s", opt_facet_term_sort, opt_facet_term_count); + 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, " @attr 2=%s ", opt_facet_term_sort); + } + if (opt_facet_term_count && opt_facet_term_count[0] != '\0') { + wrbuf_printf(wrbuf, " @attr 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) { + yaz_log(YLOG_DEBUG, "client has facet: Missing %p %p %s", cl, (cl ? cl->resultset: 0), name); + return 0; + } + facet_field = ZOOM_resultset_get_facet_field(cl->resultset, name); + if (facet_field) { + yaz_log(YLOG_DEBUG, "client: has facets for %s", name); + return 1; + } + yaz_log(YLOG_DEBUG, "client: No facets for %s", name); + return 0; +} + + void client_start_search(struct client *cl) { struct session_database *sdb = client_get_database(cl); @@ -585,13 +674,14 @@ void client_start_search(struct client *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 { + 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); } @@ -655,8 +745,11 @@ int client_destroy(struct client *c) 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); @@ -669,10 +762,7 @@ int client_destroy(struct client *c) 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); @@ -817,6 +907,7 @@ int client_parse_query(struct client *cl, const char *query) else cl->cqlquery = 0; + /* TODO FIX Not thread safe */ if (!se->relevance) { // Initialize relevance structure with query terms