Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --combined src/client.c
index 8e5ffab,6a7f6a4..cb5088d
--- 1/src/client.c
--- 2/src/client.c
+++ b/src/client.c
@@@ -556,44 -556,41 +556,41 @@@ void client_record_response(struct clie
      }
  }
  
- static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
-     int index = 0;
+ 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) {
-             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 (opt_facet_term_count && *opt_facet_term_count)
+     {
+         int index = 0;
+         struct session *session = client_get_session(cl);
+         struct conf_service *service = session->service;
+         int num = service->num_metadata;
+         WRBUF wrbuf = wrbuf_alloc();
+         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 (wrbuf_len(wrbuf))
+                     wrbuf_puts(wrbuf, ", ");
+                 wrbuf_printf(wrbuf, "@attr 1=%s", conf_meta->name);
+                 
+                 if (opt_facet_term_sort && *opt_facet_term_sort)
+                     wrbuf_printf(wrbuf, " @attr 2=%s", opt_facet_term_sort);
+                 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;
+         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;
  }
@@@ -844,34 -841,6 +841,34 @@@ static char *make_cqlquery(struct clien
      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)
  {
@@@ -929,8 -898,6 +926,8 @@@
      xfree(cl->cqlquery);
      if (*sru)
      {
 +        if (!strcmp(sru, "solr")
 +
          if (!(cl->cqlquery = make_cqlquery(cl)))
              return -1;
      }