#include <yaz/yaz-iconv.h>
#include <yaz/log.h>
#include <yaz/facet.h>
+#include <yaz/wrbuf.h>
#include "sru-p.h"
}
}
-static void yaz_solr_decode_result(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr) {
+static int yaz_solr_decode_result(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr) {
Odr_int start = 0;
struct _xmlAttr *attr;
for (attr = ptr->properties; attr; attr = attr->next)
if (!strcmp((const char *) attr->name, "numFound")) {
sr->numberOfRecords = odr_intdup(o, odr_atoi(
(const char *) attr->children->content));
- } else if (!strcmp((const char *) attr->name, "start")) {
+ }
+ else if (!strcmp((const char *) attr->name, "start")) {
start = odr_atoi((const char *) attr->children->content);
}
}
- yaz_solr_decode_result_docs(o, ptr, start, sr);
+ if (sr->numberOfRecords && *sr->numberOfRecords > 0)
+ yaz_solr_decode_result_docs(o, ptr, start, sr);
+ if (sr->numberOfRecords)
+ return 0;
+ return -1;
}
static Z_AttributeList *yaz_solr_use_atttribute_create(ODR o, const char *name) {
- // TODO IMPLEMENT
- return 0;
+ Z_AttributeList *attributes= (Z_AttributeList *) odr_malloc(o, sizeof(*attributes));
+ Z_AttributeElement ** elements;
+ attributes->num_attributes = 1;
+ /* TODO check on name instead
+ if (!attributes->num_attributes) {
+ attributes->attributes = (Z_AttributeElement**)odr_nullval();
+ return attributes;
+ }
+ */
+ 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]->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->num_list = 1;
+ 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 *) odr_strdup(o, name);
+ elements[0]->value.complex->semanticAction = 0;
+ elements[0]->value.complex->num_semanticAction = 0;
+ attributes->attributes = elements;
+ return attributes;
}
static const char *get_facet_term_count(xmlNodePtr node, int *freq) {
- // TODO implement
- return 0;
+
+ const char *term = xml_node_attribute_value_get(node, "int", "name");
+ xmlNodePtr child;
+ WRBUF wrbuf = wrbuf_alloc();
+ if (!term)
+ return term;
+
+ for (child = node->children; child ; child = child->next) {
+ if (child->type == XML_TEXT_NODE)
+ wrbuf_puts(wrbuf, (const char *) child->content);
+ }
+ *freq = atoi(wrbuf_cstr(wrbuf));
+ wrbuf_destroy(wrbuf);
+ return term;
}
Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr)
return facet_field;
}
-static void yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root, Z_SRW_searchRetrieveResponse *sr) {
+static int yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root, Z_SRW_searchRetrieveResponse *sr) {
xmlNodePtr ptr;
for (ptr = root->children; ptr; ptr = ptr->next)
{
break;
}
}
+ return 0;
}
static void yaz_solr_decode_facets(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr) {
if (request->facetList) {
Z_FacetList *facet_list = request->facetList;
- int limit;
+ int limit = 0;
Odr_int olimit;
yaz_add_name_value_str(encode, name, value, &i, "facet", "true");
yaz_solr_encode_facet_list(encode, name, value, &i, facet_list, &limit);