projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add config.h stuff
[yaz-moved-to-github.git]
/
src
/
solr.c
diff --git
a/src/solr.c
b/src/solr.c
index
0bd9152
..
8fa648b
100644
(file)
--- a/
src/solr.c
+++ b/
src/solr.c
@@
-3,9
+3,12
@@
* See the file LICENSE for details.
*/
/**
* 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>
#include <stdlib.h>
#include <assert.h>
@@
-18,12
+21,12
@@
#include "sru-p.h"
#include "sru-p.h"
+#define SOLR_MAX_PARAMETERS 100
+
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#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;
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 = (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));
elements[0]->attributeSet = odr_nullval();
elements[0]->which = Z_AttributeValue_complex;
elements[0]->value.complex = (Z_ComplexAttribute *) odr_malloc(o, sizeof(Z_ComplexAttribute));
@@
-161,7
+164,13
@@
static const char *get_facet_term_count(xmlNodePtr node, int *freq) {
}
Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr)
}
Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr)
+
{
{
+ Z_AttributeList *list;
+ Z_FacetField *facet_field;
+ int num_terms = 0;
+ int index = 0;
+ xmlNodePtr node;
// USE attribute
const char* name = xml_node_attribute_value_get(ptr, "lst", "name");
char *pos = strstr(name, "_exact");
// USE attribute
const char* name = xml_node_attribute_value_get(ptr, "lst", "name");
char *pos = strstr(name, "_exact");
@@
-169,11
+178,7
@@
Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr, Z_SRW_searchRet
if (pos) {
pos[0] = 0;
}
if (pos) {
pos[0] = 0;
}
- Z_AttributeList *list = yaz_solr_use_atttribute_create(o, name);
- Z_FacetField *facet_field;
- int num_terms = 0;
- int index = 0;
- xmlNodePtr node;
+ list = yaz_solr_use_atttribute_create(o, name);
for (node = ptr->children; node; node = node->next) {
num_terms++;
}
for (node = ptr->children; node; node = node->next) {
num_terms++;
}
@@
-215,10
+220,6
@@
static int yaz_solr_decode_facet_counts(ODR o, xmlNodePtr root, Z_SRW_searchRetr
return 0;
}
return 0;
}
-static void yaz_solr_decode_facets(ODR o, xmlNodePtr ptr, Z_SRW_searchRetrieveResponse *sr) {
- if (match_xml_node_attribute(ptr, "lst", "name", "facet_counts"))
- yaz_solr_decode_facet_counts(o, ptr->children, sr);
-}
#endif
int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
#endif
int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
@@
-257,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 (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 && match_xml_node_attribute(ptr, "lst", "name", "facet_counts"))
rc_facets = yaz_solr_decode_facet_counts(o, ptr, sr);
}
ret = rc_result + rc_facets;
rc_facets = yaz_solr_decode_facet_counts(o, ptr, sr);
}
ret = rc_result + rc_facets;
@@
-288,10
+291,11
@@
static void yaz_solr_encode_facet_field(ODR encode, char **name, char **value, i
yaz_add_name_value_str(encode, name, value, i, "facet.field", odr_strdup(encode, wrbuf_cstr(wrbuf)));
if (attr_values.limit > 0) {
WRBUF wrbuf2 = wrbuf_alloc();
yaz_add_name_value_str(encode, name, value, i, "facet.field", odr_strdup(encode, wrbuf_cstr(wrbuf)));
if (attr_values.limit > 0) {
WRBUF wrbuf2 = wrbuf_alloc();
+ Odr_int olimit;
wrbuf_puts(wrbuf2, "f.");
wrbuf_puts(wrbuf2, wrbuf_cstr(wrbuf));
wrbuf_puts(wrbuf2, ".facet.limit");
wrbuf_puts(wrbuf2, "f.");
wrbuf_puts(wrbuf2, wrbuf_cstr(wrbuf));
wrbuf_puts(wrbuf2, ".facet.limit");
- Odr_int olimit = attr_values.limit;
+ olimit = attr_values.limit;
yaz_add_name_value_int(encode, name, value, i, odr_strdup(encode, wrbuf_cstr(wrbuf2)), &olimit);
wrbuf_destroy(wrbuf2);
}
yaz_add_name_value_int(encode, name, value, i, odr_strdup(encode, wrbuf_cstr(wrbuf2)), &olimit);
wrbuf_destroy(wrbuf2);
}
@@
-354,8
+358,8
@@
int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
if (request->facetList) {
Z_FacetList *facet_list = request->facetList;
int limit = 0;
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_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;
yaz_solr_encode_facet_list(encode, name, value, &i, facet_list, &limit);
/*
olimit = limit;