int yaz_solr_decode_response(ODR o, Z_HTTP_Response *hres, Z_SRW_PDU **pdup)
{
int ret = -1;
+ Z_SRW_PDU *pdu = 0;
#if YAZ_HAVE_XML2
const char *content_buf = hres->content_buf;
int content_len = hres->content_len;
xmlDocPtr doc = xmlParseMemory(content_buf, content_len);
- Z_SRW_PDU *pdu = 0;
if (doc)
{
xmlNodePtr root = xmlDocGetRootElement(doc);
if (root && !strcmp((const char *) root->name, "response"))
{
- ret = 0;
- for (ptr = root->children; ptr && !ret; ptr = ptr->next)
+ for (ptr = root->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr->name, "result"))
}
xmlFreeDoc(doc);
}
- if (ret == 0)
- *pdup = pdu;
#endif
+ *pdup = pdu;
return ret;
}
char *cp;
const char *path_args = 0;
int i = 0;
+ int defType_set = 0;
int no_parms = 20; /* safe upper limit of args without extra_args */
Z_SRW_extra_arg *ea;
+ if (srw_pdu->which == Z_SRW_searchRetrieve_request)
+ { /* to make room for facets in yaz_solr_encode_facet_list later */
+ Z_SRW_searchRetrieveRequest *request = srw_pdu->u.request;
+ if (request->facetList)
+ no_parms += request->facetList->num;
+ }
for (ea = srw_pdu->extra_args; ea; ea = ea->next)
no_parms++;
name = (char **) odr_malloc(encode, sizeof(*name) * no_parms);
for (ea = srw_pdu->extra_args; ea; ea = ea->next)
{
name[i] = ea->name;
+ if (!strcmp(ea->name, "defType"))
+ defType_set = 1;
value[i] = ea->value;
i++;
}
solr_op = "select";
if (!srw_pdu->u.request->query)
return -1;
- yaz_add_name_value_str(encode, name, value, &i, "defType", "lucene");
+ if (!defType_set)
+ yaz_add_name_value_str(encode, name, value, &i, "defType",
+ "lucene");
yaz_add_name_value_str(encode, name, value, &i, "q", request->query);
if (srw_pdu->u.request->startRecord)
{
}
strcat(path, uri_args);
hreq->path = path;
-
- z_HTTP_header_add_content_type(encode, &hreq->headers,
- "text/xml", charset);
return 0;
}