Skip Facets: Check for empty string. And reset Facet settings

[pazpar2-moved-to-github.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index c7c0443..6df84b2 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -136,10 +136,14 @@ 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 (!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)
@@ -557,12 +561,18 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
     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;
-    yaz_log(YLOG_DEBUG, "Facet settings, sort: %s count: %s", opt_facet_term_sort, opt_facet_term_count);
     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) {