X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsolr.c;h=659d16f0f3025d1554daa5166fa816b6a0c89a98;hp=734e3653ab6eca06b2b83618c76753a310ab637e;hb=7b1bbfddfb6e9d68c645388e3279a4990a6592ef;hpb=55f306a7eb44ebfa39c096d2c76ad0cf12a089ea diff --git a/src/solr.c b/src/solr.c index 734e365..659d16f 100644 --- a/src/solr.c +++ b/src/solr.c @@ -1,11 +1,14 @@ /* 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 +#endif #include #include @@ -18,12 +21,12 @@ #include "sru-p.h" +#define SOLR_MAX_PARAMETERS 100 + #if YAZ_HAVE_XML2 #include #include -#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; @@ -127,7 +130,7 @@ static Z_AttributeList *yaz_solr_use_atttribute_create(ODR o, const char *name) 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)); @@ -257,7 +260,7 @@ int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup) rc_result = yaz_solr_decode_result(o, ptr, sr); /* 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 && match_xml_node_attribute(ptr, "lst", "name", "facet_counts")) + 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;