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
Merge branch 'yaz-756'
[yaz-moved-to-github.git]
/
src
/
solr.c
diff --git
a/src/solr.c
b/src/solr.c
index
e9d3dcf
..
c1c1bba
100644
(file)
--- a/
src/solr.c
+++ b/
src/solr.c
@@
-18,6
+18,7
@@
#include <yaz/log.h>
#include <yaz/facet.h>
#include <yaz/wrbuf.h>
#include <yaz/log.h>
#include <yaz/facet.h>
#include <yaz/wrbuf.h>
+#include <yaz/proto.h>
#include "sru-p.h"
#include "sru-p.h"
@@
-153,7
+154,7
@@
Z_FacetField *yaz_solr_decode_facet_field(ODR o, xmlNodePtr ptr,
xmlNodePtr node;
// USE attribute
const char* name = yaz_element_attribute_value_get(ptr, "lst", "name");
xmlNodePtr node;
// USE attribute
const char* name = yaz_element_attribute_value_get(ptr, "lst", "name");
- list = yaz_use_attribute_create(o, name);
+ list = zget_AttributeList_use_string(o, name);
for (node = ptr->children; node; node = node->next)
num_terms++;
facet_field = facet_field_create(o, list, num_terms);
for (node = ptr->children; node; node = node->next)
num_terms++;
facet_field = facet_field_create(o, list, num_terms);
@@
-583,6
+584,9
@@
int yaz_solr_encode_request(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
odr_malloc(encode, strlen(hreq->path) +
strlen(uri_args) + strlen(solr_op) + 5);
odr_malloc(encode, strlen(hreq->path) +
strlen(uri_args) + strlen(solr_op) + 5);
+ cp = strchr(hreq->path, '#');
+ if (cp)
+ *cp = '\0';
cp = strchr(hreq->path, '?');
if (cp)
{
cp = strchr(hreq->path, '?');
if (cp)
{