*/
/**
* \file solr.c
- * \brief Implements SOAP Webservice decoding/encoding
+ * \brief Implements Solr decoding/encoding
*/
#if HAVE_CONFIG_H
#include <config.h>
for (node = ptr->children; node; node = node->next)
if (node->type == XML_ELEMENT_NODE)
sr->num_records++;
-
- sr->records = odr_malloc(o, sizeof(*sr->records) * sr->num_records);
+
+ if (sr->num_records)
+ sr->records = odr_malloc(o, sizeof(*sr->records) * sr->num_records);
for (node = ptr->children; node; node = node->next)
{
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;
}
xmlNodePtr node;
// USE attribute
const char* name = yaz_element_attribute_value_get(ptr, "lst", "name");
- char *pos = strstr(name, "_exact");
- /* HACK */
- if (pos) {
- pos[0] = 0;
- }
list = yaz_use_attribute_create(o, name);
for (node = ptr->children; node; node = node->next)
num_terms++;
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;
#endif
}
-static void yaz_solr_encode_facet_field(
+static int yaz_solr_encode_facet_field(
ODR encode, char **name, char **value, int *i,
Z_FacetField *facet_field)
{
yaz_facet_attr_init(&attr_values);
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)
+
+ if (attr_values.errcode)
+ return -1;
+ if (attr_values.useattr)
{
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)));
}
wrbuf_destroy(wrbuf);
}
+ return 0;
}
-static void yaz_solr_encode_facet_list(
+static int yaz_solr_encode_facet_list(
ODR encode, char **name, char **value,
int *i, Z_FacetList *facet_list)
{
int index;
for (index = 0; index < facet_list->num; index++)
{
- yaz_solr_encode_facet_field(encode, name, value, i,
- facet_list->elements[index]);
+ int r = yaz_solr_encode_facet_field(encode, name, value, i,
+ facet_list->elements[index]);
+ if (r)
+ return -1;
}
+ return 0;
}
int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
Z_FacetList *facet_list = request->facetList;
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);
- /*
- olimit = limit;
- yaz_add_name_value_int(encode, name, value, &i, "facet.limit", &olimit);
- */
-
+ if (yaz_solr_encode_facet_list(encode, name, value, &i, facet_list))
+ return -1;
}
}
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";