X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsolr.c;h=16c5fa61a5e557037a217d1cba8073ec4fa53a24;hb=3c287bc1d48ee6a1f300054c2cebd0ba312bd5b9;hp=701e9f3d0b3874f7eed2686aa74ddfff6edfb55f;hpb=847dc126960b1bcc6ce8cef8a73e3606588770af;p=yaz-moved-to-github.git

diff --git a/src/solr.c b/src/solr.c
index 701e9f3..16c5fa6 100644
--- a/src/solr.c
+++ b/src/solr.c
@@ -4,7 +4,7 @@
  */
 /**
  * \file solr.c
- * \brief Implements SOAP Webservice decoding/encoding
+ * \brief Implements Solr decoding/encoding
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -27,6 +27,15 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+static void extract_text_node(xmlNodePtr node, WRBUF wrbuf) {
+    xmlNodePtr child;
+    for (child = node->children; child ; child = child->next)
+    {
+        if (child->type == XML_TEXT_NODE)
+            wrbuf_puts(wrbuf, (const char *) child->content);
+    }
+}
+
 static int match_xml_node_attribute(
     xmlNodePtr ptr,
     const char *node_name, const char *attribute_name, const char *value)
@@ -194,6 +203,64 @@ static int yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root,
     return 0;
 }
 
+static void yaz_solr_decode_suggestion_values(xmlNodePtr listPptr, WRBUF wrbuf)
+{
+    xmlNodePtr node;
+    for (node = listPptr; node; node= node->next) {
+        if (!strcmp((char*) node->name, "lst")) {
+            xmlNodePtr child;
+            for (child = node->children; child; child= child->next) {
+                if (match_xml_node_attribute(child, "str", "name", "word")) {
+                    wrbuf_puts(wrbuf, "<suggestion>");
+                    extract_text_node(child, wrbuf);
+                    wrbuf_puts(wrbuf, "</suggestion>\n");
+                }
+            }
+        }
+    }
+}
+
+static void yaz_solr_decode_suggestion_lst(xmlNodePtr lstPtr, WRBUF wrbuf)
+{
+    xmlNodePtr node;
+    for (node = lstPtr; node; node= node->next) {
+        if (match_xml_node_attribute(node, "arr", "name", "suggestion")) {
+            yaz_solr_decode_suggestion_values(node->children, wrbuf);
+        }
+    }
+}
+
+static void yaz_solr_decode_misspelled(xmlNodePtr lstPtr, WRBUF wrbuf)
+{
+    xmlNodePtr node;
+    for (node = lstPtr; node; node= node->next)
+    {
+        if (!strcmp((const char*) node->name, "lst")) {
+            const char *misspelled = yaz_element_attribute_value_get(node, "lst", "name");
+            if (misspelled) {
+                wrbuf_printf(wrbuf, "<misspelled term=\"%s\">\n", misspelled);
+                yaz_solr_decode_suggestion_lst(node->children, wrbuf);
+                wrbuf_puts(wrbuf, "</misspelled>\n");
+            }
+        }
+    }
+}
+
+static int yaz_solr_decode_spellcheck(ODR o, xmlNodePtr spellcheckPtr, Z_SRW_searchRetrieveResponse *sr)
+{
+    xmlNodePtr ptr;
+    WRBUF wrbuf = wrbuf_alloc();
+    wrbuf_puts(wrbuf, "");
+    for (ptr = spellcheckPtr->children; ptr; ptr = ptr->next)
+    {
+        if (match_xml_node_attribute(ptr, "lst", "name", "suggestions"))
+        {
+            yaz_solr_decode_misspelled(ptr->children, wrbuf);
+        }
+    }
+    sr->suggestions = odr_strdup(o, wrbuf_cstr(wrbuf));
+    return 0;
+}
 #endif
 
 int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
@@ -235,9 +302,12 @@ int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
                 /* TODO The check on hits is a work-around to avoid garbled facets on zero results from the SOLR server.
                  * The work-around works because the results is before the facets in the xml. */
                 if (rc_result == 0 &&  *sr->numberOfRecords > 0 &&
-                    match_xml_node_attribute(ptr, "lst", "name",
-                                             "facet_counts"))
+                    match_xml_node_attribute(ptr, "lst", "name", "facet_counts"))
                     rc_facets =  yaz_solr_decode_facet_counts(o, ptr, sr);
+                if (rc_result == 0 &&  *sr->numberOfRecords == 0 &&
+                    match_xml_node_attribute(ptr, "lst", "name", "spellcheck"))
+                    rc_facets =  yaz_solr_decode_spellcheck(o, ptr, sr);
+
             }
             ret = rc_result + rc_facets;
         }
@@ -356,7 +426,20 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
     }
     else
         return -1;
-    name[i] = 0;
+
+    if (srw_pdu->extra_args)
+    {
+        Z_SRW_extra_arg *ea = srw_pdu->extra_args;
+        for (; ea && i < SOLR_MAX_PARAMETERS; ea = ea->next)
+        {
+            name[i] = ea->name;
+            value[i] = ea->value;
+            i++;
+        }
+    }
+
+    name[i++] = 0;
+
     yaz_array_to_uri(&uri_args, encode, name, value);
     
     hreq->method = "GET";