X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=8e5ffab0a007ad28a2b9efe5cfcfa912a199beda;hb=bb03324e36af45daebeec54c3737b7d6c3591878;hp=b5df1c15ad74d6f75a0a3e389cba2cbc7d72a13f;hpb=903d6513d13cb3821c863a0c3935baf96b730c6c;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index b5df1c1..8e5ffab 100644
--- 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)
@@ -400,9 +404,9 @@ int client_report_facets(struct client *cl, ZOOM_resultset rs) {
     ZOOM_facet_field *facets = ZOOM_resultset_facets(rs);
     int facet_num;
     struct session *se = client_get_session(cl);
-    yaz_log(YLOG_DEBUG, "client_report_facets %p %p", rs, cl->resultset);
-
     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;
@@ -557,11 +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;
     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) {
@@ -572,10 +583,10 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
             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);
+                wrbuf_printf(wrbuf, " @attr 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);
+                wrbuf_printf(wrbuf, " @attr 3=%s ", opt_facet_term_count);
             }
         }
     }
@@ -589,14 +600,16 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
 
 int client_has_facet(struct client *cl, const char *name) {
     ZOOM_facet_field facet_field;
-    if (!cl || !cl->resultset || !name)
+    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, "target has facets for %s", name);
+        yaz_log(YLOG_DEBUG, "client: has facets for %s", name);
         return 1;
     }
-    yaz_log(YLOG_DEBUG, "target: No facets for %s", name);
+    yaz_log(YLOG_DEBUG, "client: No facets for %s", name);
     return 0;
 }
 
@@ -831,6 +844,34 @@ static char *make_cqlquery(struct client *cl)
     return r;
 }
 
+// returns a xmalloced SOLR query corresponding to the pquery in client
+// TODO Could prob. be merge with the similar make_cqlquery
+static char *make_solrquery(struct client *cl)
+{
+    cql_transform_t sqlt = solr_transform_create();
+    Z_RPNQuery *zquery;
+    char *r;
+    WRBUF wrb = wrbuf_alloc();
+    int status;
+    ODR odr_out = odr_createmem(ODR_ENCODE);
+
+    zquery = p_query_rpn(odr_out, cl->pquery);
+    yaz_log(YLOG_LOG, "PQF: %s", cl->pquery);
+    if ((status = solr_transform_rpn2solr_wrbuf(sqlt, wrb, zquery)))
+    {
+        yaz_log(YLOG_WARN, "Failed to generate SOLR query, code=%d", status);
+        r = 0;
+    }
+    else
+    {
+        r = xstrdup(wrbuf_cstr(wrb));
+    }
+    wrbuf_destroy(wrb);
+    odr_destroy(odr_out);
+    cql_transform_close(sqlt);
+    return r;
+}
+
 // Parse the query given the settings specific to this client
 int client_parse_query(struct client *cl, const char *query)
 {
@@ -888,6 +929,8 @@ int client_parse_query(struct client *cl, const char *query)
     xfree(cl->cqlquery);
     if (*sru)
     {
+        if (!strcmp(sru, "solr")
+
         if (!(cl->cqlquery = make_cqlquery(cl)))
             return -1;
     }