/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/**
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <assert.h>
-
+#include <yaz/facet.h>
#include "sru-p.h"
static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len,
return add_xsd_string_ns(ptr, elem, val, 0);
}
-static void add_xsd_integer(xmlNodePtr ptr, const char *elem,
+void add_xsd_integer(xmlNodePtr ptr, const char *elem,
const Odr_int *val)
{
if (val)
return match_xsd_string_n(ptr, elem, o, val, 0);
}
-static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o,
- char **val, int *len)
+static int match_xsd_XML_n2(xmlNodePtr ptr, const char *elem, ODR o,
+ char **val, int *len, int fixup_root)
{
xmlBufferPtr buf;
+ int no_root_nodes = 0;
if (!match_element(ptr, elem))
return 0;
{
/* copy node to get NS right (bug #740). */
xmlNode *tmp = xmlCopyNode(ptr, 1);
-
+
xmlNodeDump(buf, tmp->doc, tmp, 0, 0);
-
+
xmlFreeNode(tmp);
+ no_root_nodes++;
}
}
-
- *val = (char *) odr_malloc(o, buf->use+1);
- memcpy (*val, buf->content, buf->use);
+ if (no_root_nodes != 1 && fixup_root)
+ {
+ /* does not appear to be an XML document. Make it so */
+ xmlBufferAddHead(buf, (const xmlChar *) "<yaz_record>", -1);
+ xmlBufferAdd(buf, (const xmlChar *) "</yaz_record>", -1);
+ }
+ *val = (char *) odr_malloc(o, buf->use + 1);
+ memcpy(*val, buf->content, buf->use);
(*val)[buf->use] = '\0';
if (len)
return 1;
}
-
+
+static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o,
+ char **val, int *len)
+{
+ return match_xsd_XML_n2(ptr, elem, o, val, len, 0);
+}
+
static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o,
Odr_int **val)
{
char *yaz_negotiate_sru_version(char *input_ver)
{
if (!input_ver)
- input_ver = "1.1";
-
+ return "2.0";
if (!strcmp(input_ver, "1.1"))
return "1.1";
- return "1.2"; /* our latest supported version */
+ if (!strncmp(input_ver, "1.", 2))
+ return "1.2";
+ if (!strncmp(input_ver, "2.", 2))
+ return "2.0";
+ return 0;
}
static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
Z_SRW_extra_record **extra,
- void *client_data, const char *ns)
+ void *client_data, int version2)
{
if (o->direction == ODR_DECODE)
{
Z_SRW_extra_record ex;
char *spack = 0;
- int pack = Z_SRW_recordPacking_string;
xmlNodePtr ptr;
- xmlNodePtr data_ptr = 0;
+#ifdef Z_SRW_packed
+ rec->packing = 0;
+#endif
rec->recordSchema = 0;
rec->recordData_buf = 0;
rec->recordData_len = 0;
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
-
- if (match_xsd_string(ptr, "recordSchema", o,
+
+ if (match_xsd_string(ptr, "recordSchema", o,
&rec->recordSchema))
;
else if (match_xsd_string(ptr, "recordPacking", o, &spack))
- {
- if (spack)
- pack = yaz_srw_str_to_pack(spack);
- }
- else if (match_xsd_integer(ptr, "recordPosition", o,
+ ; /* can't rely on it: in SRU 2.0 it's different semantics */
+ else if (match_xsd_integer(ptr, "recordPosition", o,
&rec->recordPosition))
;
else if (match_element(ptr, "recordData"))
{
- /* save position of Data until after the loop
- then we will know the packing (hopefully), and
- unpacking is done once
- */
- data_ptr = ptr;
+ /* we assume XML packing, if any element nodes exist below
+ recordData. Unfortunately, in SRU 2.0 recordPacking
+ means something different */
+ xmlNode *p = ptr->children;
+ for (; p; p = p->next)
+ if (p->type == XML_ELEMENT_NODE)
+ break;
+ if (p)
+ {
+ match_xsd_XML_n2(
+ ptr, "recordData", o,
+ &rec->recordData_buf, &rec->recordData_len, 1);
+ rec->recordPacking = Z_SRW_recordPacking_XML;
+ }
+ else
+ {
+ match_xsd_string_n(
+ ptr, "recordData", o,
+ &rec->recordData_buf, &rec->recordData_len);
+ rec->recordPacking = Z_SRW_recordPacking_string;
+ }
}
- else if (match_xsd_XML_n(ptr, "extraRecordData", o,
+ else if (match_xsd_XML_n(ptr, "extraRecordData", o,
&ex.extraRecordData_buf,
&ex.extraRecordData_len) )
;
else
- match_xsd_string(ptr, "recordIdentifier", o,
+ match_xsd_string(ptr, "recordIdentifier", o,
&ex.recordIdentifier);
}
- if (data_ptr)
- {
- switch(pack)
- {
- case Z_SRW_recordPacking_XML:
- match_xsd_XML_n(data_ptr, "recordData", o,
- &rec->recordData_buf, &rec->recordData_len);
- break;
- case Z_SRW_recordPacking_URL:
- /* just store it as a string.
- leave it to the backend to collect the document */
- match_xsd_string_n(data_ptr, "recordData", o,
- &rec->recordData_buf, &rec->recordData_len);
- break;
- case Z_SRW_recordPacking_string:
- match_xsd_string_n(data_ptr, "recordData", o,
- &rec->recordData_buf, &rec->recordData_len);
- break;
- }
- }
- rec->recordPacking = pack;
if (ex.extraRecordData_buf || ex.recordIdentifier)
{
*extra = (Z_SRW_extra_record *)
add_xsd_string(ptr, "recordSchema", rec->recordSchema);
if (spack)
- add_xsd_string(ptr, "recordPacking", spack);
- switch(pack)
+ {
+ if (version2)
+ add_xsd_string(ptr, "recordXMLEscaping", spack);
+ else
+ add_xsd_string(ptr, "recordPacking", spack);
+ }
+ switch (pack)
{
case Z_SRW_recordPacking_string:
add_xsd_string_n(ptr, "recordData", rec->recordData_buf,
static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
Z_SRW_extra_record ***extra,
- int *num, void *client_data, const char *ns)
+ int *num, void *client_data, int version2)
{
if (o->direction == ODR_DECODE)
{
if (ptr->type == XML_ELEMENT_NODE &&
!xmlStrcmp(ptr->name, BAD_CAST "record"))
{
- yaz_srw_record(o, ptr, *recs + i, *extra + i, client_data, ns);
+ yaz_srw_record(o, ptr, *recs + i, *extra + i, client_data, 0);
i++;
}
}
xmlNodePtr rptr = xmlNewChild(pptr, 0, BAD_CAST "record",
0);
yaz_srw_record(o, rptr, (*recs)+i, (*extra ? *extra + i : 0),
- client_data, ns);
+ client_data, version2);
}
}
return 0;
rec->versionValue = 0;
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
-
- if (match_xsd_string(ptr, "versionType", o,
+
+ if (match_xsd_string(ptr, "versionType", o,
&rec->versionType))
;
else
return 0;
}
-static int yaz_srw_versions(ODR o, xmlNodePtr pptr,
+static int yaz_srw_versions(ODR o, xmlNodePtr pptr,
Z_SRW_recordVersion **vers,
int *num, void *client_data, const char *ns)
{
Z_FacetTerm *yaz_sru_proxy_get_facet_term_count(ODR odr, xmlNodePtr node)
{
- int freq;
+ Odr_int freq;
xmlNodePtr child;
WRBUF wrbuf = wrbuf_alloc();
- const char *freq_string = yaz_element_attribute_value_get(node, "facetvalue", "est_representation");
- Z_Term *term;
+ Z_FacetTerm *facet_term;
+ const char *freq_string = yaz_element_attribute_value_get(
+ node, "facetvalue", "est_representation");
if (freq_string)
- freq = atoi(freq_string);
+ freq = odr_atoi(freq_string);
else
freq = -1;
- for (child = node->children; child ; child = child->next) {
+ for (child = node->children; child ; child = child->next)
+ {
if (child->type == XML_TEXT_NODE)
wrbuf_puts(wrbuf, (const char *) child->content);
}
- term = term_create(odr, wrbuf_cstr(wrbuf));
- yaz_log(YLOG_DEBUG, "sru-proxy facet: %s %d", wrbuf_cstr(wrbuf), freq);
+ facet_term = facet_term_create_cstr(odr, wrbuf_cstr(wrbuf), freq);
wrbuf_destroy(wrbuf);
- return facet_term_create(odr, term, freq);
-};
+ return facet_term;
+}
static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr)
{
{
if (match_element(node, "facetvalue"))
{
- facet_field_term_set(odr, facet_field, yaz_sru_proxy_get_facet_term_count(odr, node), index);
+ facet_field_term_set(odr, facet_field,
+ yaz_sru_proxy_get_facet_term_count(odr, node),
+ index);
index++;
}
}
num_facets = 0;
for (node = ptr->children; node; node= node->next)
{
- if (match_element(node, "facet")) {
- facet_list_field_set(o, facet_list, yaz_sru_proxy_decode_facet_field(o, node), num_facets);
+ if (match_element(node, "facet"))
+ {
+ facet_list_field_set(
+ o, facet_list,
+ yaz_sru_proxy_decode_facet_field(o, node), num_facets);
num_facets++;
}
}
(*recs)[i].uri = 0;
(*recs)[i].details = 0;
(*recs)[i].message = 0;
- }
+ }
for (i = 0, ptr = pptr; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
(*recs)[i].message = 0;
for (rptr = ptr->children; rptr; rptr = rptr->next)
{
- if (match_xsd_string(rptr, "uri", o,
+ if (match_xsd_string(rptr, "uri", o,
&(*recs)[i].uri))
;
- else if (match_xsd_string(rptr, "details", o,
+ else if (match_xsd_string(rptr, "details", o,
&(*recs)[i].details))
;
else
xmlNodePtr ptr = xmlDocGetRootElement(doc);
while (ptr && ptr->type != XML_ELEMENT_NODE)
ptr = ptr->next;
- if (ptr && ptr->ns
+ if (ptr && ptr->ns
&& !xmlStrcmp(ptr->ns->href,
BAD_CAST "http://www.loc.gov/zing/srw/diagnostic/"))
{
{
if (match_xsd_string(ptr, "value", o, &term->value))
;
- else if (match_xsd_integer(ptr, "numberOfRecords", o,
+ else if (match_xsd_integer(ptr, "numberOfRecords", o,
&term->numberOfRecords))
;
- else if (match_xsd_string(ptr, "displayTerm", o,
+ else if (match_xsd_string(ptr, "displayTerm", o,
&term->displayTerm))
;
else
while (method && method->type == XML_TEXT_NODE)
method = method->next;
-
+
if (!method)
return -1;
if (method->type != XML_ELEMENT_NODE)
return -1;
- *p = yaz_srw_get_core_v_1_1(o);
-
+ *p = yaz_srw_get_core_v_2_0(o);
+
if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveRequest"))
{
xmlNodePtr ptr = method->children;
Z_SRW_searchRetrieveRequest *req;
+ char *recordPacking = 0;
+ char *recordXMLEscaping = 0;
+ const char *facetLimit = 0;
(*p)->which = Z_SRW_searchRetrieve_request;
req = (*p)->u.request = (Z_SRW_searchRetrieveRequest *)
odr_malloc(o, sizeof(*req));
- req->query_type = Z_SRW_query_type_cql;
- req->query.cql = 0;
+ req->queryType = "cql";
+ req->query = 0;
req->sort_type = Z_SRW_sort_type_none;
req->sort.none = 0;
req->startRecord = 0;
req->maximumRecords = 0;
req->recordSchema = 0;
req->recordPacking = 0;
+ req->packing = 0;
req->recordXPath = 0;
req->resultSetTTL = 0;
req->stylesheet = 0;
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "query", o,
- &req->query.cql))
- req->query_type = Z_SRW_query_type_cql;
- else if (match_xsd_string(ptr, "pQuery", o,
- &req->query.pqf))
- req->query_type = Z_SRW_query_type_pqf;
- else if (match_xsd_string(ptr, "xQuery", o,
- &req->query.xcql))
- req->query_type = Z_SRW_query_type_xcql;
+ else if (match_xsd_string(ptr, "queryType", o,
+ &req->queryType))
+ ;
+ else if (match_xsd_string(ptr, "query", o,
+ &req->query))
+ ;
+ else if (match_xsd_string(ptr, "pQuery", o,
+ &req->query))
+ req->queryType = "pqf";
+ else if (match_xsd_string(ptr, "xQuery", o,
+ &req->query))
+ req->queryType = "xcql";
else if (match_xsd_integer(ptr, "startRecord", o,
&req->startRecord))
;
&req->maximumRecords))
;
else if (match_xsd_string(ptr, "recordPacking", o,
- &req->recordPacking))
+ &recordPacking))
;
- else if (match_xsd_string(ptr, "recordSchema", o,
+ else if (match_xsd_string(ptr, "recordXMLEscaping", o,
+ &recordXMLEscaping))
+ ;
+ else if (match_xsd_string(ptr, "recordSchema", o,
&req->recordSchema))
;
else if (match_xsd_string(ptr, "recordXPath", o,
else if (match_xsd_integer(ptr, "resultSetTTL", o,
&req->resultSetTTL))
;
- else if (match_xsd_string(ptr, "sortKeys", o,
+ else if (match_xsd_string(ptr, "sortKeys", o,
&req->sort.sortKeys))
req->sort_type = Z_SRW_sort_type_sort;
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
- else
- match_xsd_string(ptr, "database", o, &req->database);
+ else if (match_xsd_string(ptr, "database", o, &req->database))
+ ;
+ else if (match_xsd_string(ptr, "facetLimit", o,
+ (char**) &facetLimit))
+ ;
}
- if (!req->query.cql && !req->query.pqf && !req->query.xcql)
+ if (!req->query)
{
/* should put proper diagnostic here */
return -1;
}
+ if (!strcmp((*p)->srw_version, "2.0"))
+ {
+ req->recordPacking = recordXMLEscaping;
+ req->packing = recordPacking;
+ }
+ else
+ {
+ req->recordPacking = recordPacking;
+ }
+ yaz_sru_facet_request(o, &req->facetList, &facetLimit);
}
else if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveResponse"))
{
odr_malloc(o, sizeof(*res));
res->numberOfRecords = 0;
+ res->resultCountPrecision = 0;
res->resultSetId = 0;
res->resultSetIdleTime = 0;
res->records = 0;
res->num_diagnostics = 0;
res->nextRecordPosition = 0;
res->facetList = 0;
+ res->suggestions = 0;
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
&(*p)->extraResponseData_buf,
&(*p)->extraResponseData_len))
;
- else if (match_xsd_integer(ptr, "numberOfRecords", o,
+ else if (match_xsd_integer(ptr, "numberOfRecords", o,
&res->numberOfRecords))
;
- else if (match_xsd_string(ptr, "resultSetId", o,
+ else if (match_xsd_string(ptr, "resultCountPrecision", o,
+ &res->resultCountPrecision))
+ ;
+ else if (match_xsd_string(ptr, "resultSetId", o,
&res->resultSetId))
;
- else if (match_xsd_integer(ptr, "resultSetIdleTime", o,
+ else if (match_xsd_integer(ptr, "resultSetIdleTime", o,
+ &res->resultSetIdleTime))
+ ;
+ else if (match_xsd_integer(ptr, "resultSetTTL", o,
&res->resultSetIdleTime))
;
else if (match_element(ptr, "records"))
yaz_srw_records(o, ptr, &res->records,
&res->extra_records,
- &res->num_records, client_data, ns);
+ &res->num_records, client_data, 0);
else if (match_xsd_integer(ptr, "nextRecordPosition", o,
&res->nextRecordPosition))
;
client_data, ns);
else if (match_element(ptr, "facet_analysis"))
yaz_sru_proxy_decode_facets(o, ptr, &res->facetList);
+ else if (match_element(ptr, "facetedResults"))
+ yaz_sru_facet_response(o, &res->facetList, ptr);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainRequest"))
{
Z_SRW_explainRequest *req;
xmlNodePtr ptr = method->children;
-
+
(*p)->which = Z_SRW_explain_request;
req = (*p)->u.explain_request = (Z_SRW_explainRequest *)
odr_malloc(o, sizeof(*req));
req->recordPacking = 0;
+ req->packing = 0;
req->database = 0;
req->stylesheet = 0;
for (; ptr; ptr = ptr->next)
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
&(*p)->extraResponseData_buf,
&(*p)->extraResponseData_len))
;
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
&(*p)->extraResponseData_buf,
&(*p)->extraResponseData_len))
;
else if (match_element(ptr, "record"))
yaz_srw_record(o, ptr, &res->record, &res->extra_record,
- client_data, ns);
+ client_data, 0);
else if (match_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
(*p)->which = Z_SRW_scan_request;
req = (*p)->u.scan_request = (Z_SRW_scanRequest *)
odr_malloc(o, sizeof(*req));
- req->query_type = Z_SRW_query_type_cql;
- req->scanClause.cql = 0;
+ req->queryType = "cql";
+ req->scanClause = 0;
req->responsePosition = 0;
req->maximumTerms = 0;
req->stylesheet = 0;
req->database = 0;
-
+
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
&(*p)->extraResponseData_buf,
&(*p)->extraResponseData_len))
;
else if (match_xsd_string(ptr, "scanClause", o,
- &req->scanClause.cql))
+ &req->scanClause))
;
else if (match_xsd_string(ptr, "pScanClause", o,
- &req->scanClause.pqf))
+ &req->scanClause))
{
- req->query_type = Z_SRW_query_type_pqf;
+ req->queryType = "pqf";
}
else if (match_xsd_integer(ptr, "responsePosition", o,
&req->responsePosition))
res->num_terms = 0;
res->diagnostics = 0;
res->num_diagnostics = 0;
-
+
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
&(*p)->extraResponseData_buf,
&(*p)->extraResponseData_len))
;
Z_SRW_PDU **p = handler_data;
xmlNsPtr ns_srw;
xmlNodePtr ptr = 0;
-
+ int version2 = !(*p)->srw_version ||
+ strcmp((*p)->srw_version, "2.") > 0;
if ((*p)->which == Z_SRW_searchRetrieve_request)
{
Z_SRW_searchRetrieveRequest *req = (*p)->u.request;
+ const char *queryType = req->queryType;
+ if (version2)
+ ns = "http://docs.oasis-open.org/ns/search-ws/sruRequest";
ptr = xmlNewChild(pptr, 0, BAD_CAST "searchRetrieveRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
- if ((*p)->srw_version)
- add_xsd_string(ptr, "version", (*p)->srw_version);
- switch(req->query_type)
+ add_xsd_string(ptr, "version", (*p)->srw_version);
+ if (version2)
{
- case Z_SRW_query_type_cql:
- add_xsd_string(ptr, "query", req->query.cql);
- break;
- case Z_SRW_query_type_xcql:
- add_xsd_string(ptr, "xQuery", req->query.xcql);
- break;
- case Z_SRW_query_type_pqf:
- add_xsd_string(ptr, "pQuery", req->query.pqf);
- break;
+ if (queryType)
+ add_xsd_string(ptr, "queryType", queryType);
+ add_xsd_string(ptr, "query", req->query);
+ }
+ else
+ {
+ if (!queryType || !strcmp(queryType, "cql"))
+ add_xsd_string(ptr, "query", req->query);
+ else if (!strcmp(queryType, "xcql"))
+ add_xsd_string(ptr, "xQuery", req->query);
+ else if (!strcmp(queryType, "pqf"))
+ add_xsd_string(ptr, "pQuery", req->query);
}
add_xsd_integer(ptr, "startRecord", req->startRecord);
add_xsd_integer(ptr, "maximumRecords", req->maximumRecords);
- add_xsd_string(ptr, "recordPacking", req->recordPacking);
+ if (version2)
+ {
+ add_xsd_string(ptr, "recordXMLEscaping", req->recordPacking);
+ add_xsd_string(ptr, "recordPacking", req->packing);
+ }
+ else
+ add_xsd_string(ptr, "recordPacking", req->recordPacking);
add_xsd_string(ptr, "recordSchema", req->recordSchema);
add_xsd_string(ptr, "recordXPath", req->recordXPath);
add_xsd_integer(ptr, "resultSetTTL", req->resultSetTTL);
- switch(req->sort_type)
+ switch (req->sort_type)
{
case Z_SRW_sort_type_none:
break;
}
add_xsd_string(ptr, "stylesheet", req->stylesheet);
add_xsd_string(ptr, "database", req->database);
+ {
+ const char *limit = 0;
+ yaz_sru_facet_request(o, &req->facetList, &limit);
+ add_xsd_string(ptr, "facetLimit", limit);
+ }
}
else if ((*p)->which == Z_SRW_searchRetrieve_response)
{
Z_SRW_searchRetrieveResponse *res = (*p)->u.response;
+ if (version2)
+ ns = "http://docs.oasis-open.org/ns/search-ws/sruResponse";
ptr = xmlNewChild(pptr, 0, BAD_CAST "searchRetrieveResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
- if ((*p)->srw_version)
- add_xsd_string(ptr, "version", (*p)->srw_version);
+ add_xsd_string(ptr, "version", (*p)->srw_version);
add_xsd_integer(ptr, "numberOfRecords", res->numberOfRecords);
add_xsd_string(ptr, "resultSetId", res->resultSetId);
- add_xsd_integer(ptr, "resultSetIdleTime", res->resultSetIdleTime);
+ add_xsd_integer(ptr,
+ version2 ? "resultSetTTL" : "resultSetIdleTime" ,
+ res->resultSetIdleTime);
if (res->num_records)
{
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "records", 0);
yaz_srw_records(o, rptr, &res->records, &res->extra_records,
&res->num_records,
- client_data, ns);
+ client_data, version2);
}
add_xsd_integer(ptr, "nextRecordPosition",
res->nextRecordPosition);
yaz_srw_diagnostics(o, rptr, &res->diagnostics,
&res->num_diagnostics, client_data, ns);
}
+ if (res->resultCountPrecision)
+ add_xsd_string(ptr, "resultCountPrecision",
+ res->resultCountPrecision);
+ yaz_sru_facet_response(o, &res->facetList, ptr);
}
else if ((*p)->which == Z_SRW_explain_request)
{
xmlSetNs(ptr, ns_srw);
add_xsd_string(ptr, "version", (*p)->srw_version);
- add_xsd_string(ptr, "recordPacking", req->recordPacking);
+ if (version2)
+ {
+ add_xsd_string(ptr, "recordXMLEscaping", req->recordPacking);
+ add_xsd_string(ptr, "recordPacking", req->packing);
+ }
+ else
+ add_xsd_string(ptr, "recordPacking", req->recordPacking);
add_xsd_string(ptr, "stylesheet", req->stylesheet);
add_xsd_string(ptr, "database", req->database);
}
{
xmlNodePtr ptr1 = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
yaz_srw_record(o, ptr1, &res->record, &res->extra_record,
- client_data, ns);
+ client_data, version2);
}
if (res->num_diagnostics)
{
else if ((*p)->which == Z_SRW_scan_request)
{
Z_SRW_scanRequest *req = (*p)->u.scan_request;
+ const char *queryType = req->queryType;
+ if (version2)
+ ns = "http://docs.oasis-open.org/ns/search-ws/scan";
ptr = xmlNewChild(pptr, 0, BAD_CAST "scanRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
add_xsd_string(ptr, "version", (*p)->srw_version);
- switch(req->query_type)
+
+ if (version2)
{
- case Z_SRW_query_type_cql:
- add_xsd_string(ptr, "scanClause", req->scanClause.cql);
- break;
- case Z_SRW_query_type_pqf:
- add_xsd_string(ptr, "pScanClause", req->scanClause.pqf);
- break;
+ if (queryType && strcmp(queryType, "cql"))
+ add_xsd_string(ptr, "queryType", queryType);
+ add_xsd_string(ptr, "scanClause", req->scanClause);
+ }
+ else
+ {
+ if (!queryType || !strcmp(queryType, "cql"))
+ add_xsd_string(ptr, "scanClause", req->scanClause);
+ else if (!strcmp(queryType, "pqf"))
+ add_xsd_string(ptr, "pScanClause", req->scanClause);
}
add_xsd_integer(ptr, "responsePosition", req->responsePosition);
add_xsd_integer(ptr, "maximumTerms", req->maximumTerms);
else if ((*p)->which == Z_SRW_scan_response)
{
Z_SRW_scanResponse *res = (*p)->u.scan_response;
+ if (version2)
+ ns = "http://docs.oasis-open.org/ns/search-ws/scan";
ptr = xmlNewChild(pptr, 0, BAD_CAST "scanResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
add_xsd_string(ptr, "version", (*p)->srw_version);
-
if (res->num_terms)
{
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "terms", 0);
else
return -1;
if (ptr && (*p)->extraResponseData_len)
- add_XML_n(ptr, "extraResponseData",
- (*p)->extraResponseData_buf,
+ add_XML_n(ptr, "extraResponseData",
+ (*p)->extraResponseData_buf,
(*p)->extraResponseData_len, ns_srw);
-
+
}
return 0;
while (method && method->type == XML_TEXT_NODE)
method = method->next;
-
+
if (!method)
return -1;
if (method->type != XML_ELEMENT_NODE)
return -1;
- *p = yaz_srw_get_core_v_1_1(o);
-
+ *p = yaz_srw_get_core_v_2_0(o);
+
if (!xmlStrcmp(method->name, BAD_CAST "updateRequest"))
{
xmlNodePtr ptr = method->children;
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "action", o,
+ else if (match_xsd_string(ptr, "action", o,
&oper)){
- if ( oper ){
- if ( !strcmp(oper, "info:srw/action/1/delete"))
+ if (oper)
+ {
+ if (!strcmp(oper, "info:srw/action/1/delete"))
req->operation = "delete";
else if (!strcmp(oper,"info:srw/action/1/replace" ))
req->operation = "replace";
- else if ( !strcmp( oper, "info:srw/action/1/create"))
+ else if (!strcmp(oper, "info:srw/action/1/create"))
req->operation = "insert";
}
}
{
req->record = yaz_srw_get_record(o);
yaz_srw_record(o, ptr, req->record, &req->extra_record,
- client_data, ns_ucp_str);
+ client_data, 0);
}
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "operationStatus", o,
+ else if (match_xsd_string(ptr, "operationStatus", o,
&res->operationStatus ))
;
- else if (match_xsd_string(ptr, "recordIdentifier", o,
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
&res->recordId))
;
- else if (match_element(ptr, "recordVersions" ))
+ else if (match_element(ptr, "recordVersions" ))
yaz_srw_versions(o, ptr, &res->recordVersions,
&res->num_recordVersions,
client_data, ns_ucp_str);
{
res->record = yaz_srw_get_record(o);
yaz_srw_record(o, ptr, res->record, &res->extra_record,
- client_data, ns_ucp_str);
+ client_data, 0);
}
else if (match_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
Z_SRW_PDU **p = handler_data;
xmlNsPtr ns_ucp, ns_srw;
-
if ((*p)->which == Z_SRW_update_request)
{
Z_SRW_updateRequest *req = (*p)->u.update_request;
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
xmlSetNs(rptr, ns_srw);
yaz_srw_record(o, rptr, req->record, &req->extra_record,
- client_data, ns_ucp_str);
+ client_data, 0);
}
if (req->extraRequestData_len)
{
- add_XML_n(ptr, "extraRequestData",
- req->extraRequestData_buf,
+ add_XML_n(ptr, "extraRequestData",
+ req->extraRequestData_buf,
req->extraRequestData_len, ns_srw);
}
add_xsd_string(ptr, "stylesheet", req->stylesheet);
else if ((*p)->which == Z_SRW_update_response)
{
Z_SRW_updateResponse *res = (*p)->u.update_response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, (xmlChar *)
+ xmlNodePtr ptr = xmlNewChild(pptr, 0, (xmlChar *)
"updateResponse", 0);
ns_ucp = xmlNewNs(ptr, BAD_CAST ns_ucp_str, BAD_CAST "zu");
xmlSetNs(ptr, ns_ucp);
ns_srw = xmlNewNs(ptr, BAD_CAST ns_srw_str, BAD_CAST "zs");
-
+
add_xsd_string_ns(ptr, "version", (*p)->srw_version, ns_srw);
add_xsd_string(ptr, "operationStatus", res->operationStatus );
add_xsd_string(ptr, "recordIdentifier", res->recordId );
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
xmlSetNs(rptr, ns_srw);
yaz_srw_record(o, rptr, res->record, &res->extra_record,
- client_data, ns_ucp_str);
+ client_data, 0);
}
if (res->num_diagnostics)
{
xmlNsPtr ns_diag =
xmlNewNs(pptr, BAD_CAST YAZ_XMLNS_DIAG_v1_1,
BAD_CAST "diag" );
-
+
xmlNodePtr rptr = xmlNewChild(ptr, ns_diag, BAD_CAST "diagnostics", 0);
yaz_srw_diagnostics(o, rptr, &res->diagnostics,
&res->num_diagnostics, client_data,
ns_ucp_str);
}
if (res->extraResponseData_len)
- add_XML_n(ptr, "extraResponseData",
- res->extraResponseData_buf,
+ add_XML_n(ptr, "extraResponseData",
+ res->extraResponseData_buf,
res->extraResponseData_len, ns_srw);
}
else
return -1;
-
}
return 0;
}
projects / yaz-moved-to-github.git / blobdiff