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

diff --git a/src/client.c b/src/client.c
index 8f4946d..8e5ffab 100644
--- a/src/client.c
+++ b/src/client.c
@@ -562,8 +562,11 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
     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)
+    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;
@@ -841,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)
 {
@@ -898,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;
     }