X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsolr.c;h=659d16f0f3025d1554daa5166fa816b6a0c89a98;hb=7bfdd9cdcbfd12d6690278c9b56a7ac26b2457e9;hp=0a5ca4021fb6e3e9e10ed9d741d737af6cfd848c;hpb=540b8919836aede9f2fe7f7a20978fc290e8972c;p=yaz-moved-to-github.git

diff --git a/src/solr.c b/src/solr.c
index 0a5ca40..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 <config.h>
+#endif
 
 #include <stdlib.h>
 #include <assert.h>
@@ -18,12 +21,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 +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));
@@ -255,7 +258,9 @@ int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
                 if (ptr->type == XML_ELEMENT_NODE &&
                     !strcmp((const char *) ptr->name, "result"))
                         rc_result = yaz_solr_decode_result(o, ptr, sr);
-                if (match_xml_node_attribute(ptr, "lst", "name", "facet_counts"))
+                /* 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 &&  *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;
@@ -354,6 +359,7 @@ int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
             Z_FacetList *facet_list = request->facetList;
             int limit = 0;
             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, &limit);
             /*
             olimit = limit;