X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolr.c;h=33c81b0a1f7189ca3a6a2ef77a1211893100fffb;hp=d4f63ca043af37918acec7164c4da9ecfd20a3b5;hb=44fa6a1823276d0f45796404e0fc5423a6a7f71d;hpb=b1f4aab8ff8fbf10958a3a18644972165d60621c diff --git a/src/solr.c b/src/solr.c index d4f63ca..33c81b0 100644 --- a/src/solr.c +++ b/src/solr.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "sru-p.h" @@ -93,7 +94,7 @@ static void yaz_solr_decode_result_docs(ODR o, xmlNodePtr ptr, Odr_int start, Z_ } } -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) @@ -101,22 +102,62 @@ static void yaz_solr_decode_result(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveRe 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 *) 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) @@ -142,7 +183,7 @@ Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, Z_SRW_searchRet 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) { @@ -162,10 +203,11 @@ static void yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root, Z_SRW_searchRet facet_list_field_set(o, facet_list, yaz_solr_decode_facet_field(o, node, sr), num_facets); num_facets++; } - sr->facet_list = facet_list; + sr->facetList = facet_list; break; } } + return 0; } static void yaz_solr_decode_facets(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr) { @@ -202,19 +244,18 @@ int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup) } else { - /** look for result node */ + /** look for result (required) and facets node (optional) */ + int rc_result = -1; + int rc_facets = 0; for (ptr = root->children; ptr; ptr = ptr->next) { if (ptr->type == XML_ELEMENT_NODE && !strcmp((const char *) ptr->name, "result")) - yaz_solr_decode_result(o, ptr, sr); + rc_result = yaz_solr_decode_result(o, ptr, sr); if (match_xml_node_attribute(ptr, "lst", "name", "facet_counts")) - yaz_solr_decode_facet_counts(o, ptr, sr); - } - if (!ptr) - { - ret = -1; + rc_facets = yaz_solr_decode_facet_counts(o, ptr, sr); } + ret = rc_result + rc_facets; } } if (doc) @@ -294,9 +335,9 @@ 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); - if (request->facet_list) { - Z_FacetList *facet_list = request->facet_list; - int limit; + 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_solr_encode_facet_list(encode, name, value, &i, facet_list, &limit);