From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 16 Aug 2010 13:22:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.0~49
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=4dff82b21feb6db92443026561d106691ad29ee0;hp=5410847495fb43bdc5c3e630fbc3f15a964640f9;p=pazpar2-moved-to-github.git

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

diff --git a/src/client.c b/src/client.c
index 6a7f6a4..cb5088d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -841,6 +841,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 +926,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;
     }