/* 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.
*/
/**
{
/* 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++;
}
Z_SRW_extra_record ex;
char *spack = 0;
- int pack = Z_SRW_recordPacking_string;
xmlNodePtr ptr;
- xmlNodePtr data_ptr = 0;
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_n2(data_ptr, "recordData", o,
- &rec->recordData_buf, &rec->recordData_len, 1);
- 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 *)
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)
{
(*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);
-
+
if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveRequest"))
{
xmlNodePtr ptr = method->children;
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "query", o,
+ 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,
+ 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,
+ else if (match_xsd_string(ptr, "xQuery", o,
&req->query.xcql))
req->query_type = Z_SRW_query_type_xcql;
else if (match_xsd_integer(ptr, "startRecord", o,
else if (match_xsd_string(ptr, "recordPacking", o,
&req->recordPacking))
;
- else if (match_xsd_string(ptr, "recordSchema", o,
+ 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,
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, "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_element(ptr, "records"))
{
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));
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))
;
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))
;
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;
-
+
if ((*p)->which == Z_SRW_searchRetrieve_request)
{
Z_SRW_searchRetrieveRequest *req = (*p)->u.request;
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);
-
+
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 (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);
}
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 );
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
projects / yaz-moved-to-github.git / blobdiff