X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolr.c;h=5863fe1aceb0646dc5e988688dd6e87ce53ea427;hp=5c438314da3ac5d3b048b35372bbe7cc3a79bdfa;hb=fe42f72dc30321041420cf2d1a83867b1c450f38;hpb=c18fa0350a008cd57973968334ccf8270026b2e0

diff --git a/src/solr.c b/src/solr.c
index 5c43831..5863fe1 100644
--- a/src/solr.c
+++ b/src/solr.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -26,7 +26,6 @@
 #if YAZ_HAVE_XML2
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#endif
 
 static void extract_text_node(xmlNodePtr node, WRBUF wrbuf) {
     xmlNodePtr child;
@@ -69,7 +68,7 @@ static void yaz_solr_decode_result_docs(ODR o, xmlNodePtr ptr,
     for (node = ptr->children; node; node = node->next)
         if (node->type == XML_ELEMENT_NODE)
             sr->num_records++;
-    
+
     if (sr->num_records)
         sr->records = odr_malloc(o, sizeof(*sr->records) * sr->num_records);
 
@@ -91,8 +90,6 @@ static void yaz_solr_decode_result_docs(ODR o, xmlNodePtr ptr,
             record->recordData_buf = odr_malloc(o, buf->use + 1);
             memcpy(record->recordData_buf, buf->content, buf->use);
             record->recordData_buf[buf->use] = '\0';
-            // TODO Solve the real problem in zoom-sru, that doesnt work with 0-based indexes.
-            // Work-around: Making the recordPosition 1-based.
             record->recordPosition = odr_intdup(o, start + offset + 1);
 
             xmlBufferFree(buf);
@@ -115,7 +112,7 @@ static int yaz_solr_decode_result(ODR o, xmlNodePtr ptr,
             {
                 sr->numberOfRecords = odr_intdup(o, odr_atoi(
                         (const char *) attr->children->content));
-            } 
+            }
             else if (!strcmp((const char *) attr->name, "start"))
             {
                 start = odr_atoi((const char *) attr->children->content);
@@ -204,13 +201,14 @@ static int yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root,
     return 0;
 }
 
-static yaz_solr_decode_suggestion_values(xmlNodePtr ptr, WRBUF wrbuf) {
+static void yaz_solr_decode_suggestion_values(xmlNodePtr listPptr, WRBUF wrbuf)
+{
     xmlNodePtr node;
-    for (node = ptr; node; node= node->next) {
-        if (!strcmp(ptr->name,"lst")) {
+    for (node = listPptr; node; node= node->next) {
+        if (!strcmp((char*) node->name, "lst")) {
             xmlNodePtr child;
-            for (child = ptr->children; child; child= child->next) {
-                if (match(child, "str", "name", "word")) {
+            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");
@@ -220,7 +218,8 @@ static yaz_solr_decode_suggestion_values(xmlNodePtr ptr, WRBUF wrbuf) {
     }
 }
 
-static yaz_solr_decode_suggestion_lst(xmlNodePtr lstPtr, WRBUF wrbuf) {
+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")) {
@@ -234,10 +233,10 @@ 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")) {
+        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\">", misspelled);
+                wrbuf_printf(wrbuf, "<misspelled term=\"%s\">\n", misspelled);
                 yaz_solr_decode_suggestion_lst(node->children, wrbuf);
                 wrbuf_puts(wrbuf, "</misspelled>\n");
             }
@@ -260,6 +259,7 @@ static int yaz_solr_decode_spellcheck(ODR o, xmlNodePtr spellcheckPtr, Z_SRW_sea
     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)
 {
@@ -368,7 +368,7 @@ static int yaz_solr_encode_facet_list(
                                             facet_list->elements[index]);
         if (r)
             return -1;
-        
+
     }
     return 0;
 }
@@ -382,8 +382,8 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
     char *uri_args;
     char *path;
     int i = 0;
-    
-    z_HTTP_header_add_basic_auth(encode, &hreq->headers, 
+
+    z_HTTP_header_add_basic_auth(encode, &hreq->headers,
                                  srw_pdu->username, srw_pdu->password);
     if (srw_pdu->which == Z_SRW_searchRetrieve_request)
     {
@@ -413,6 +413,15 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
         yaz_add_name_value_str(encode, name, value, &i,
                                "fl", request->recordSchema);
 
+        switch(srw_pdu->u.request->sort_type)
+        {
+        case Z_SRW_sort_type_none:
+            break;
+        case Z_SRW_sort_type_sort:
+            yaz_add_name_value_str(encode, name, value, &i, "sort",
+                                   srw_pdu->u.request->sort.sortKeys);
+            break;
+        }
         if (request->facetList)
         {
             Z_FacetList *facet_list = request->facetList;
@@ -439,9 +448,9 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
     name[i++] = 0;
 
     yaz_array_to_uri(&uri_args, encode, name, value);
-    
+
     hreq->method = "GET";
-    
+
     path = (char *)
         odr_malloc(encode, strlen(hreq->path) +
                    strlen(uri_args) + strlen(solr_op) + 4);