/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
- * \file srwutil.c
- * \brief Implements SRW/SRU utilities.
+ * \file solr.c
+ * \brief Implements SOAP Webservice decoding/encoding
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <assert.h>
#include "sru-p.h"
+#define SOLR_MAX_PARAMETERS 100
+
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
-#define SOLR_MAX_PARAMETERS 100
-
const char *xml_node_attribute_value_get(xmlNodePtr ptr, const char *node_name, const char *attribute_name) {
struct _xmlAttr *attr;
elements = (Z_AttributeElement**) odr_malloc (o, attributes->num_attributes * sizeof(*elements));
elements[0] = (Z_AttributeElement*)odr_malloc(o,sizeof(**elements));
elements[0]->attributeType = odr_malloc(o, sizeof(*elements[0]->attributeType));
- *elements[0]->attributeType = 1;
+ *elements[0]->attributeType = 1;
elements[0]->attributeSet = odr_nullval();
elements[0]->which = Z_AttributeValue_complex;
elements[0]->value.complex = (Z_ComplexAttribute *) odr_malloc(o, sizeof(Z_ComplexAttribute));
elements[0]->value.complex->list = (Z_StringOrNumeric **) odr_malloc(o, 1 * sizeof(Z_StringOrNumeric *));
elements[0]->value.complex->list[0] = (Z_StringOrNumeric *) odr_malloc(o, sizeof(Z_StringOrNumeric));
elements[0]->value.complex->list[0]->which = Z_StringOrNumeric_string;
- elements[0]->value.complex->list[0]->u.string = (Z_InternationalString *) name;
+ elements[0]->value.complex->list[0]->u.string = (Z_InternationalString *) odr_strdup(o, name);
elements[0]->value.complex->semanticAction = 0;
elements[0]->value.complex->num_semanticAction = 0;
attributes->attributes = elements;
}
Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr)
+
{
- // USE attribute
- const char* name = xml_node_attribute_value_get(ptr, "lst", "name");
- Z_AttributeList *list = yaz_solr_use_atttribute_create(o, name);
+ Z_AttributeList *list;
Z_FacetField *facet_field;
int num_terms = 0;
int index = 0;
xmlNodePtr node;
+ // USE attribute
+ const char* name = xml_node_attribute_value_get(ptr, "lst", "name");
+ char *pos = strstr(name, "_exact");
+ /* HACK */
+ if (pos) {
+ pos[0] = 0;
+ }
+ list = yaz_solr_use_atttribute_create(o, name);
for (node = ptr->children; node; node = node->next) {
num_terms++;
}
return 0;
}
-static void yaz_solr_decode_facets(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr) {
- if (match_xml_node_attribute(ptr, "lst", "name", "facet_counts"))
- yaz_solr_decode_facet_counts(o, ptr->children, sr);
-}
#endif
int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
if (ptr->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr->name, "result"))
rc_result = yaz_solr_decode_result(o, ptr, sr);
- if (match_xml_node_attribute(ptr, "lst", "name", "facet_counts"))
+ /* 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"))
rc_facets = yaz_solr_decode_facet_counts(o, ptr, sr);
}
ret = rc_result + rc_facets;
yaz_facet_attr_get_z_attributes(attribute_list, &attr_values);
// TODO do we want to support server decided
if (!attr_values.errcode && attr_values.useattr) {
- yaz_add_name_value_str(encode, name, value, i, "facet.field", (char *) attr_values.useattr);
- // TODO max(attr_values, *limit);
- if (attr_values.limit > 0 && attr_values.limit > *limit) {
- *limit = attr_values.limit;
+ WRBUF wrbuf = wrbuf_alloc();
+ wrbuf_puts(wrbuf, (char *) attr_values.useattr);
+ /* Skip date field */
+ if (strcmp("date", attr_values.useattr) != 0)
+ wrbuf_puts(wrbuf, "_exact");
+ yaz_add_name_value_str(encode, name, value, i, "facet.field", odr_strdup(encode, wrbuf_cstr(wrbuf)));
+ if (attr_values.limit > 0) {
+ WRBUF wrbuf2 = wrbuf_alloc();
+ Odr_int olimit;
+ wrbuf_puts(wrbuf2, "f.");
+ wrbuf_puts(wrbuf2, wrbuf_cstr(wrbuf));
+ wrbuf_puts(wrbuf2, ".facet.limit");
+ olimit = attr_values.limit;
+ yaz_add_name_value_int(encode, name, value, i, odr_strdup(encode, wrbuf_cstr(wrbuf2)), &olimit);
+ wrbuf_destroy(wrbuf2);
}
+ wrbuf_destroy(wrbuf);
}
}
if (request->facetList) {
Z_FacetList *facet_list = request->facetList;
int limit = 0;
- Odr_int olimit;
yaz_add_name_value_str(encode, name, value, &i, "facet", "true");
+ yaz_add_name_value_str(encode, name, value, &i, "facet.mincount", "1");
yaz_solr_encode_facet_list(encode, name, value, &i, facet_list, &limit);
+ /*
olimit = limit;
yaz_add_name_value_int(encode, name, value, &i, "facet.limit", &olimit);
+ */
}
break;