X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=492cb8879c2a692cfc8c010e8f9c08d3145af83d;hb=3a3a0d3c1c05d30b8520b86fa8fdcbe0123fbb1c;hp=c238f0a9f31074da10e394cc06520e46bb3b7d9d;hpb=0be537a08d164975e9584a6c89240b28343a6ec2;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index c238f0a..492cb88 100644 --- a/src/client.c +++ b/src/client.c @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_CONFIG_H #include #endif -#include #include #include #include @@ -79,7 +78,7 @@ static void client_use(int delta) 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) @@ -140,14 +139,12 @@ void client_set_state(struct client *cl, enum client_state st) 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); @@ -526,6 +523,76 @@ 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); + 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); @@ -586,15 +653,18 @@ 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 { + 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; @@ -639,7 +709,7 @@ void client_unlock(struct client *c) 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); } @@ -647,7 +717,7 @@ int client_destroy(struct client *c) { 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)) { @@ -656,8 +726,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); @@ -670,10 +743,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); @@ -818,6 +888,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