/* 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.
*/
/**
* \file solr.c
- * \brief Implements SOAP Webservice decoding/encoding
+ * \brief Implements Solr decoding/encoding
*/
#if HAVE_CONFIG_H
#include <config.h>
#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)
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);
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);
{
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);
return -1;
}
-static const char *get_facet_term_count(xmlNodePtr node, int *freq)
+static const char *get_facet_term_count(xmlNodePtr node, Odr_int *freq)
{
const char *term = yaz_element_attribute_value_get(node, "int", "name");
xmlNodePtr child;
if (child->type == XML_TEXT_NODE)
wrbuf_puts(wrbuf, (const char *) child->content);
}
- *freq = atoi(wrbuf_cstr(wrbuf));
+ *freq = odr_atoi(wrbuf_cstr(wrbuf));
wrbuf_destroy(wrbuf);
return term;
}
index = 0;
for (node = ptr->children; node; node = node->next)
{
- int count = 0;
+ Odr_int count = 0;
const char *term = get_facet_term_count(node, &count);
facet_field_term_set(o, facet_field,
- facet_term_create(o, term_create(o, term), count),
- index);
+ facet_term_create_cstr(o, term, count), index);
index++;
}
return facet_field;
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)
/* 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;
}
facet_list->elements[index]);
if (r)
return -1;
-
+
}
return 0;
}
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)
{
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;
}
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";
-
+
path = (char *)
odr_malloc(encode, strlen(hreq->path) +
strlen(uri_args) + strlen(solr_op) + 4);
projects / yaz-moved-to-github.git / blobdiff