From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 26 Oct 2010 12:18:06 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.1.4~15
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=31c5e5fa92f5980deac3c042b765e4148329cd1b;hp=-c

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

31c5e5fa92f5980deac3c042b765e4148329cd1b
diff --combined src/solr.c
index c91cea8,55a86ca..9b77eee
--- a/src/solr.c
+++ b/src/solr.c
@@@ -18,12 -18,12 +18,12 @@@
  
  #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;
@@@ -127,7 -127,7 +127,7 @@@ static Z_AttributeList *yaz_solr_use_at
      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 -257,7 +257,7 @@@ int yaz_solr_decode_response(ODR o, Z_H
                          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;