-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
- *
- * $Id: srw.c,v 1.47 2006-08-16 22:47:10 adam Exp $
*/
/**
* \file srw.c
* \brief Implements SRW/SRU package encoding and decoding
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
#include <yaz/srw.h>
+#include <yaz/wrbuf.h>
#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
+#include <assert.h>
+
+#include "sru-p.h"
-static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len)
+static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len,
+ xmlNsPtr ns_ptr)
{
if (val)
{
xmlDocPtr doc = xmlParseMemory(val,len);
if (doc)
{
- xmlNodePtr c = xmlNewChild(ptr, 0, BAD_CAST elem, 0);
+ xmlNodePtr c = xmlNewChild(ptr, ns_ptr, BAD_CAST elem, 0);
xmlNodePtr t = xmlDocGetRootElement(doc);
xmlAddChild(c, xmlCopyNode(t,1));
xmlFreeDoc(doc);
return 0;
}
-xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
+xmlNodePtr add_xsd_string_ns(xmlNodePtr ptr, const char *elem, const char *val,
+ xmlNsPtr ns_ptr)
{
if (val)
- return xmlNewTextChild(ptr, 0, BAD_CAST elem,
- BAD_CAST val);
+ {
+ xmlNodePtr c = xmlNewChild(ptr, ns_ptr, BAD_CAST elem, 0);
+ xmlNodePtr t = xmlNewText(BAD_CAST val);
+ xmlAddChild(c, t);
+ return t;
+ }
return 0;
}
-static void add_xsd_integer(xmlNodePtr ptr, const char *elem, const int *val)
+xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
+{
+ return add_xsd_string_ns(ptr, elem, val, 0);
+}
+
+static void add_xsd_integer(xmlNodePtr ptr, const char *elem,
+ const Odr_int *val)
{
if (val)
{
- char str[30];
- sprintf(str, "%d", *val);
+ char str[40];
+ sprintf(str, ODR_INT_PRINTF, *val);
xmlNewTextChild(ptr, 0, BAD_CAST elem, BAD_CAST str);
}
}
static int match_element(xmlNodePtr ptr, const char *elem)
{
if (ptr->type == XML_ELEMENT_NODE && !xmlStrcmp(ptr->name, BAD_CAST elem))
+ {
return 1;
+ }
return 0;
}
if (!match_element(ptr, elem))
return 0;
- ptr = ptr->children;
- while (ptr && (ptr->type == XML_TEXT_NODE || ptr->type == XML_COMMENT_NODE))
- ptr = ptr->next;
- if (!ptr)
- return 0;
+
buf = xmlBufferCreate();
+
+ /* Copy each element nodes at top.
+ In most cases there is only one root node.. At least one server
+ http://www.theeuropeanlibrary.org/sru/sru.pl
+ has multiple root nodes in recordData.
+ */
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE)
+ {
+ /* copy node to get NS right (bug #740). */
+ xmlNode *tmp = xmlCopyNode(ptr, 1);
+
+ xmlNodeDump(buf, tmp->doc, tmp, 0, 0);
+
+ xmlFreeNode(tmp);
+ }
+ }
- xmlNodeDump(buf, ptr->doc, ptr, 0, 0);
-
- *val = odr_malloc(o, buf->use+1);
+ *val = (char *) odr_malloc(o, buf->use+1);
memcpy (*val, buf->content, buf->use);
(*val)[buf->use] = '\0';
return 1;
}
-static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o, int **val)
+static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o,
+ Odr_int **val)
{
#if CHECK_TYPE
struct _xmlAttr *attr;
ptr = ptr->children;
if (!ptr || ptr->type != XML_TEXT_NODE)
return 0;
- *val = odr_intdup(o, atoi((const char *) ptr->content));
+ *val = odr_intdup(o, odr_atoi((const char *) ptr->content));
return 1;
}
-static int yaz_srw_extra_record(ODR o, xmlNodePtr pptr,
- Z_SRW_extra_record *rec,
- void *client_data, const char *ns)
+char *yaz_negotiate_sru_version(char *input_ver)
{
- if (o->direction == ODR_DECODE)
- {
- xmlNodePtr ptr;
- rec->type = 1;
- rec->recordId = 0;
- rec->recordReviewCode = 0;
- rec->recordReviewNote = 0;
- rec->recordLockStatus = 0;
- rec->recordOldVersion = 0;
- rec->nonDupRecordId = 0;
- for (ptr = pptr->children; ptr; ptr = ptr->next)
- {
- if (match_xsd_string(ptr, "recordId", o,
- &rec->recordId ))
- ;
- else if (match_xsd_string(ptr, "recordReviewCode", o,
- &rec->recordReviewCode ))
- ;
- else if (match_xsd_string(ptr, "recordReviewNote", o,
- &rec->recordReviewNote ))
- ;
- else if (match_xsd_string(ptr, "nonDupRecordId", o,
- &rec->nonDupRecordId ))
- ;
- else if (match_xsd_string(ptr, "recordLockStatus", o,
- &rec->recordLockStatus ))
- ;
- else if (match_xsd_string(ptr, "recordOldVersion", o,
- &rec->recordOldVersion ))
- ;
- }
- }
- else if (o->direction == ODR_ENCODE)
- {
- xmlNodePtr ptr = pptr;
- if ( rec->recordId )
- add_xsd_string(ptr, "recordId", rec->recordId);
- if ( rec->recordReviewCode )
- add_xsd_string(ptr, "recordReviewCode", rec->recordReviewCode);
- if ( rec->recordReviewNote )
- add_xsd_string(ptr, "recordReviewNote", rec->recordReviewNote);
- if ( rec->nonDupRecordId )
- add_xsd_string(ptr, "nonDupRecordId", rec->nonDupRecordId);
- if ( rec->recordLockStatus )
- add_xsd_string(ptr, "recordLockStatus", rec->recordLockStatus);
- if ( rec->recordOldVersion )
- add_xsd_string(ptr, "recordOldVersion", rec->recordOldVersion);
- }
- return 0;
+ if (!input_ver)
+ input_ver = "1.1";
+
+ if (!strcmp(input_ver, "1.1"))
+ return "1.1";
+ return "1.2"; /* our latest supported version */
}
static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
{
if (o->direction == ODR_DECODE)
{
+ Z_SRW_extra_record ex;
+
char *spack = 0;
int pack = Z_SRW_recordPacking_string;
xmlNodePtr ptr;
rec->recordData_len = 0;
rec->recordPosition = 0;
*extra = 0;
+
+ ex.extraRecordData_buf = 0;
+ ex.extraRecordData_len = 0;
+ ex.recordIdentifier = 0;
+
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
;
else if (match_xsd_string(ptr, "recordPacking", o, &spack))
{
- if (spack && !strcmp(spack, "xml"))
- pack = Z_SRW_recordPacking_XML;
- if (spack && !strcmp(spack, "url"))
- pack = Z_SRW_recordPacking_URL;
- if (spack && !strcmp(spack, "string"))
- pack = Z_SRW_recordPacking_string;
+ if (spack)
+ pack = yaz_srw_str_to_pack(spack);
}
else if (match_xsd_integer(ptr, "recordPosition", o,
&rec->recordPosition))
*/
data_ptr = ptr;
}
- else if (match_element(ptr, "extraRecordData"))
- {
- *extra = (Z_SRW_extra_record *)
- odr_malloc(o, sizeof(Z_SRW_extra_record));
- yaz_srw_extra_record(o, ptr, *extra, client_data, ns);
- }
+ else if (match_xsd_XML_n(ptr, "extraRecordData", o,
+ &ex.extraRecordData_buf,
+ &ex.extraRecordData_len) )
+ ;
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
+ &ex.recordIdentifier))
+ ;
+
}
if (data_ptr)
{
}
}
rec->recordPacking = pack;
+ if (ex.extraRecordData_buf || ex.recordIdentifier)
+ {
+ *extra = (Z_SRW_extra_record *)
+ odr_malloc(o, sizeof(Z_SRW_extra_record));
+ memcpy(*extra, &ex, sizeof(Z_SRW_extra_record));
+ }
}
else if (o->direction == ODR_ENCODE)
{
xmlNodePtr ptr = pptr;
int pack = rec->recordPacking;
- add_xsd_string(ptr, "recordSchema", rec->recordSchema);
+ const char *spack = yaz_srw_pack_to_str(pack);
+ add_xsd_string(ptr, "recordSchema", rec->recordSchema);
+ if (spack)
+ add_xsd_string(ptr, "recordPacking", spack);
switch(pack)
{
case Z_SRW_recordPacking_string:
- add_xsd_string(ptr, "recordPacking", "string");
add_xsd_string_n(ptr, "recordData", rec->recordData_buf,
rec->recordData_len);
break;
case Z_SRW_recordPacking_XML:
- add_xsd_string(ptr, "recordPacking", "xml");
add_XML_n(ptr, "recordData", rec->recordData_buf,
- rec->recordData_len);
+ rec->recordData_len, 0);
break;
case Z_SRW_recordPacking_URL:
- add_xsd_string(ptr, "recordPacking", "url");
add_xsd_string_n(ptr, "recordData", rec->recordData_buf,
rec->recordData_len);
break;
add_xsd_integer(ptr, "recordPosition", rec->recordPosition );
if (extra && *extra)
{
- xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "extraRecordData",
- 0);
- yaz_srw_extra_record(o, rptr, *extra, client_data, ns);
+ if ((*extra)->recordIdentifier)
+ add_xsd_string(ptr, "recordIdentifier",
+ (*extra)->recordIdentifier);
+ if ((*extra)->extraRecordData_buf)
+ add_XML_n(ptr, "extraRecordData",
+ (*extra)->extraRecordData_buf,
+ (*extra)->extraRecordData_len, 0);
}
}
return 0;
return 0;
}
-static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
- int *num, void *client_data, const char *ns)
+static int yaz_srw_version(ODR o, xmlNodePtr pptr, Z_SRW_recordVersion *rec,
+ void *client_data, const char *ns)
+{
+ if (o->direction == ODR_DECODE)
+ {
+ xmlNodePtr ptr;
+ rec->versionType = 0;
+ rec->versionValue = 0;
+ for (ptr = pptr->children; ptr; ptr = ptr->next)
+ {
+
+ if (match_xsd_string(ptr, "versionType", o,
+ &rec->versionType))
+ ;
+ else if (match_xsd_string(ptr, "versionValue", o,
+ &rec->versionValue))
+ ;
+ }
+ }
+ else if (o->direction == ODR_ENCODE)
+ {
+ xmlNodePtr ptr = pptr;
+ add_xsd_string(ptr, "versionType", rec->versionType);
+ add_xsd_string(ptr, "versionValue", rec->versionValue);
+ }
+ return 0;
+}
+
+static int yaz_srw_versions(ODR o, xmlNodePtr pptr,
+ Z_SRW_recordVersion **vers,
+ int *num, void *client_data, const char *ns)
{
if (o->direction == ODR_DECODE)
{
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
- !xmlStrcmp(ptr->name, BAD_CAST "diagnostic"))
+ !xmlStrcmp(ptr->name, BAD_CAST "recordVersion"))
(*num)++;
}
if (!*num)
return 1;
- *recs = (Z_SRW_diagnostic *) odr_malloc(o, *num * sizeof(**recs));
+ *vers = (Z_SRW_recordVersion *) odr_malloc(o, *num * sizeof(**vers));
+ for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !xmlStrcmp(ptr->name, BAD_CAST "recordVersion"))
+ {
+ yaz_srw_version(o, ptr, *vers + i, client_data, ns);
+ i++;
+ }
+ }
+ }
+ else if (o->direction == ODR_ENCODE)
+ {
+ int i;
for (i = 0; i < *num; i++)
{
+ xmlNodePtr rptr = xmlNewChild(pptr, 0, BAD_CAST "version",
+ 0);
+ yaz_srw_version(o, rptr, (*vers)+i, client_data, ns);
+ }
+ }
+ return 0;
+}
+
+Z_FacetTerm *yaz_sru_proxy_get_facet_term_count(ODR odr, xmlNodePtr node)
+{
+ int freq;
+ xmlNodePtr child;
+ WRBUF wrbuf = wrbuf_alloc();
+ const char *freq_string = yaz_element_attribute_value_get(node, "facetvalue", "est_representation");
+ Z_Term *term;
+ if (freq_string)
+ freq = atoi(freq_string);
+ else
+ freq = -1;
+
+ 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);
+ wrbuf_destroy(wrbuf);
+ return facet_term_create(odr, term, freq);
+};
+
+static Z_FacetField *yaz_sru_proxy_decode_facet_field(ODR odr, xmlNodePtr ptr)
+{
+ Z_AttributeList *list;
+ Z_FacetField *facet_field;
+ int num_terms = 0;
+ int index = 0;
+ xmlNodePtr node;
+ /* USE attribute */
+ const char* name = yaz_element_attribute_value_get(ptr, "facet", "code");
+ yaz_log(YLOG_DEBUG, "sru-proxy facet type: %s", name);
+
+ list = yaz_use_atttribute_create(odr, name);
+ for (node = ptr->children; node; node = node->next) {
+ if (match_element(node, "facetvalue"))
+ num_terms++;
+ }
+ facet_field = facet_field_create(odr, list, num_terms);
+ index = 0;
+ for (node = ptr->children; node; node = node->next)
+ {
+ if (match_element(node, "facetvalue"))
+ {
+ facet_field_term_set(odr, facet_field, yaz_sru_proxy_get_facet_term_count(odr, node), index);
+ index++;
+ }
+ }
+ return facet_field;
+}
+
+static int yaz_sru_proxy_decode_facets(ODR o, xmlNodePtr root,
+ Z_FacetList **facetList)
+{
+ xmlNodePtr ptr;
+
+ for (ptr = root->children; ptr; ptr = ptr->next)
+ {
+ if (match_element(ptr, "facets"))
+ {
+ xmlNodePtr node;
+ Z_FacetList *facet_list;
+ int num_facets = 0;
+ for (node = ptr->children; node; node= node->next)
+ {
+ if (node->type == XML_ELEMENT_NODE)
+ num_facets++;
+ }
+ facet_list = facet_list_create(o, num_facets);
+ 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);
+ num_facets++;
+ }
+ }
+ *facetList = facet_list;
+ break;
+ }
+ }
+ return 0;
+}
+
+
+
+static int yaz_srw_decode_diagnostics(ODR o, xmlNodePtr pptr,
+ Z_SRW_diagnostic **recs, int *num,
+ void *client_data, const char *ns)
+{
+ int i;
+ xmlNodePtr ptr;
+ *num = 0;
+ for (ptr = pptr; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !xmlStrcmp(ptr->name, BAD_CAST "diagnostic"))
+ (*num)++;
+ }
+ if (!*num)
+ return 1;
+ *recs = (Z_SRW_diagnostic *) odr_malloc(o, *num * sizeof(**recs));
+ for (i = 0; i < *num; i++)
+ {
+ (*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 &&
+ !xmlStrcmp(ptr->name, BAD_CAST "diagnostic"))
+ {
+ xmlNodePtr rptr;
(*recs)[i].uri = 0;
(*recs)[i].details = 0;
(*recs)[i].message = 0;
- }
- for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
- {
- if (ptr->type == XML_ELEMENT_NODE &&
- !xmlStrcmp(ptr->name, BAD_CAST "diagnostic"))
+ for (rptr = ptr->children; rptr; rptr = rptr->next)
{
- xmlNodePtr rptr;
- (*recs)[i].uri = 0;
- (*recs)[i].details = 0;
- (*recs)[i].message = 0;
- for (rptr = ptr->children; rptr; rptr = rptr->next)
- {
- if (match_xsd_string(rptr, "uri", o,
- &(*recs)[i].uri))
- ;
- else if (match_xsd_string(rptr, "details", o,
- &(*recs)[i].details))
- ;
- else if (match_xsd_string(rptr, "message", o,
- &(*recs)[i].message))
- ;
- }
- i++;
+ if (match_xsd_string(rptr, "uri", o,
+ &(*recs)[i].uri))
+ ;
+ else if (match_xsd_string(rptr, "details", o,
+ &(*recs)[i].details))
+ ;
+ else if (match_xsd_string(rptr, "message", o,
+ &(*recs)[i].message))
+ ;
}
+ i++;
+ }
+ }
+ return 0;
+}
+
+int sru_decode_surrogate_diagnostics(const char *buf, size_t len,
+ Z_SRW_diagnostic **diag,
+ int *num, ODR odr)
+{
+ int ret = 0;
+ xmlDocPtr doc = xmlParseMemory(buf, len);
+ if (doc)
+ {
+ xmlNodePtr ptr = xmlDocGetRootElement(doc);
+ while (ptr && ptr->type != XML_ELEMENT_NODE)
+ ptr = ptr->next;
+ if (ptr && ptr->ns
+ && !xmlStrcmp(ptr->ns->href,
+ BAD_CAST "http://www.loc.gov/zing/srw/diagnostic/"))
+ {
+ ret = yaz_srw_decode_diagnostics(odr, ptr, diag, num, 0, 0);
}
+ xmlFreeDoc(doc);
+ }
+ return ret;
+}
+
+static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
+ int *num, void *client_data, const char *ns)
+{
+ if (o->direction == ODR_DECODE)
+ {
+ return yaz_srw_decode_diagnostics(o, pptr->children, recs, num, client_data, ns);
}
else if (o->direction == ODR_ENCODE)
{
int i;
xmlNsPtr ns_diag =
- xmlNewNs(pptr, BAD_CAST
- "http://www.loc.gov/zing/srw/diagnostic/", 0);
+ xmlNewNs(pptr, BAD_CAST YAZ_XMLNS_DIAG_v1_1, BAD_CAST "diag" );
for (i = 0; i < *num; i++)
{
const char *std_diag = "info:srw/diagnostic/1/";
+ const char *ucp_diag = "info:srw/diagnostic/12/";
xmlNodePtr rptr = xmlNewChild(pptr, ns_diag,
BAD_CAST "diagnostic", 0);
add_xsd_string(rptr, "uri", (*recs)[i].uri);
if ((*recs)[i].message)
add_xsd_string(rptr, "message", (*recs)[i].message);
- else if ((*recs)[i].uri &&
- !strncmp((*recs)[i].uri, std_diag, strlen(std_diag)))
+ else if ((*recs)[i].uri )
{
- int no = atoi((*recs)[i].uri + strlen(std_diag));
- const char *message = yaz_diag_srw_str(no);
- if (message)
- add_xsd_string(rptr, "message", message);
+ if (!strncmp((*recs)[i].uri, std_diag, strlen(std_diag)))
+ {
+ int no = atoi((*recs)[i].uri + strlen(std_diag));
+ const char *message = yaz_diag_srw_str(no);
+ if (message)
+ add_xsd_string(rptr, "message", message);
+ }
+ else if (!strncmp((*recs)[i].uri, ucp_diag, strlen(ucp_diag)))
+ {
+ int no = atoi((*recs)[i].uri + strlen(ucp_diag));
+ const char *message = yaz_diag_sru_update_str(no);
+ if (message)
+ add_xsd_string(rptr, "message", message);
+ }
}
add_xsd_string(rptr, "details", (*recs)[i].details);
}
if (match_xsd_string(ptr, "value", o, &term->value))
;
else if (match_xsd_integer(ptr, "numberOfRecords", o,
- &term->numberOfRecords))
+ &term->numberOfRecords))
;
else if (match_xsd_string(ptr, "displayTerm", o,
&term->displayTerm))
return 0;
}
-Z_SRW_PDU *yaz_srw_get_core_v_1_1(ODR o)
-{
- Z_SRW_PDU *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(*p));
- p->srw_version = odr_strdup(o, "1.1");
- p->username = 0;
- p->password = 0;
- p->extra_args = 0;
- return p;
-}
-
int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
void *client_data, const char *ns)
{
{
Z_SRW_PDU **p = handler_data;
xmlNodePtr method = pptr->children;
+ char *neg_version;
while (method && method->type == XML_TEXT_NODE)
method = method->next;
&(*p)->srw_version))
;
else if (match_xsd_string(ptr, "query", o,
- &req->query.cql))
+ &req->query.cql))
req->query_type = Z_SRW_query_type_cql;
else if (match_xsd_string(ptr, "pQuery", o,
- &req->query.pqf))
+ &req->query.pqf))
req->query_type = Z_SRW_query_type_pqf;
else if (match_xsd_string(ptr, "xQuery", o,
- &req->query.xcql))
+ &req->query.xcql))
req->query_type = Z_SRW_query_type_xcql;
else if (match_xsd_integer(ptr, "startRecord", o,
&req->startRecord))
&req->sort.sortKeys))
req->sort_type = Z_SRW_sort_type_sort;
else if (match_xsd_string(ptr, "stylesheet", o,
- &req->stylesheet))
+ &req->stylesheet))
;
else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ &req->database))
;
}
+ if (!req->query.cql && !req->query.pqf && !req->query.xcql)
+ {
+ /* should put proper diagnostic here */
+ return -1;
+ }
}
else if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveResponse"))
{
res->diagnostics = 0;
res->num_diagnostics = 0;
res->nextRecordPosition = 0;
+ res->facetList = 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,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
else if (match_xsd_integer(ptr, "numberOfRecords", o,
- &res->numberOfRecords))
+ &res->numberOfRecords))
;
else if (match_xsd_string(ptr, "resultSetId", o,
&res->resultSetId))
;
else if (match_element(ptr, "records"))
yaz_srw_records(o, ptr, &res->records,
- &res->extra_records,
+ &res->extra_records,
&res->num_records, client_data, ns);
else if (match_xsd_integer(ptr, "nextRecordPosition", o,
&res->nextRecordPosition))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
client_data, ns);
+ else if (match_element(ptr, "facet_analysis"))
+ yaz_sru_proxy_decode_facets(o, ptr, &res->facetList);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainRequest"))
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
- &(*p)->srw_version))
+ &(*p)->srw_version))
+ ;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
;
else if (match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
else if (match_xsd_string(ptr, "recordPacking", o,
- &req->recordPacking))
+ &req->recordPacking))
;
else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ &req->database))
;
}
}
for (; ptr; ptr = ptr->next)
{
if (match_xsd_string(ptr, "version", o,
- &(*p)->srw_version))
+ &(*p)->srw_version))
+ ;
+ 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,
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
+ 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.cql))
;
else if (match_xsd_string(ptr, "pScanClause", o,
&req->scanClause.pqf))
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
+ else if (match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
else if (match_element(ptr, "terms"))
yaz_srw_terms(o, ptr, &res->terms,
&res->num_terms, client_data,
*p = 0;
return -1;
}
+ neg_version = yaz_negotiate_sru_version((*p)->srw_version);
+ if (neg_version)
+ (*p)->srw_version = neg_version;
}
else if (o->direction == ODR_ENCODE)
{
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;
- xmlNodePtr ptr = xmlNewChild(pptr, 0,
- BAD_CAST "searchRetrieveRequest", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "searchRetrieveRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_searchRetrieve_response)
{
Z_SRW_searchRetrieveResponse *res = (*p)->u.response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0,
- BAD_CAST "searchRetrieveResponse", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "searchRetrieveResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_explain_request)
{
Z_SRW_explainRequest *req = (*p)->u.explain_request;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "explainRequest",
- 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "explainRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_explain_response)
{
Z_SRW_explainResponse *res = (*p)->u.explain_response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "explainResponse",
- 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "explainResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_scan_request)
{
Z_SRW_scanRequest *req = (*p)->u.scan_request;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "scanRequest", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "scanRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
else if ((*p)->which == Z_SRW_scan_response)
{
Z_SRW_scanResponse *res = (*p)->u.scan_response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "scanResponse", 0);
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "scanResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
}
else
return -1;
+ if (ptr && (*p)->extraResponseData_len)
+ add_XML_n(ptr, "extraResponseData",
+ (*p)->extraResponseData_buf,
+ (*p)->extraResponseData_len, ns_srw);
+
}
return 0;
}
int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
- void *client_data, const char *ns)
+ void *client_data, const char *ns_ucp_str)
{
xmlNodePtr pptr = (xmlNodePtr) vptr;
+ const char *ns_srw_str = YAZ_XMLNS_SRU_v1_1;
if (o->direction == ODR_DECODE)
{
Z_SRW_PDU **p = handler_data;
req->database = 0;
req->operation = 0;
req->recordId = 0;
- req->recordVersion = 0;
- req->recordOldVersion = 0;
- req->record.recordData_buf = 0;
- req->record.recordData_len = 0;
- req->record.recordSchema = 0;
- req->record.recordPacking = 0;
+ req->recordVersions = 0;
+ req->num_recordVersions = 0;
+ req->record = 0;
req->extra_record = 0;
- req->extraRequestData = 0;
+ req->extraRequestData_buf = 0;
+ req->extraRequestData_len = 0;
req->stylesheet = 0;
for (; ptr; ptr = ptr->next)
if (match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "operation", o,
+ else if (match_xsd_string(ptr, "action", o,
&oper)){
if ( oper ){
- if ( !strcmp(oper, "delete"))
+ if ( !strcmp(oper, "info:srw/action/1/delete"))
req->operation = "delete";
- else if (!strcmp(oper,"replace" ))
+ else if (!strcmp(oper,"info:srw/action/1/replace" ))
req->operation = "replace";
- else if ( !strcmp( oper, "insert"))
+ else if ( !strcmp( oper, "info:srw/action/1/create"))
req->operation = "insert";
}
}
- else if (match_xsd_string(ptr, "recordId", o,
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
&req->recordId))
;
- else if (match_xsd_string(ptr, "recordVersion", o,
- &req->recordVersion))
- ;
+ else if (match_element(ptr, "recordVersions" ) )
+ yaz_srw_versions( o, ptr, &req->recordVersions,
+ &req->num_recordVersions, client_data,
+ ns_ucp_str);
else if (match_element(ptr, "record"))
- yaz_srw_record(o, ptr, &req->record, &req->extra_record,
- client_data, ns);
+ {
+ req->record = yaz_srw_get_record(o);
+ yaz_srw_record(o, ptr, req->record, &req->extra_record,
+ client_data, ns_ucp_str);
+ }
else if (match_xsd_string(ptr, "stylesheet", o,
- &req->stylesheet))
+ &req->stylesheet))
;
else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ &req->database))
;
}
}
res->operationStatus = 0;
res->recordId = 0;
- res->recordVersion = 0;
- res->recordChecksum = 0;
+ res->recordVersions = 0;
+ res->num_recordVersions = 0;
res->diagnostics = 0;
res->num_diagnostics = 0;
- res->record.recordData_buf = 0;
- res->record.recordData_len = 0;
- res->record.recordSchema = 0;
- res->record.recordPacking = 0;
+ res->record = 0;
res->extra_record = 0;
- res->extraResponseData = 0;
+ res->extraResponseData_buf = 0;
+ res->extraResponseData_len = 0;
for (; ptr; ptr = ptr->next)
{
&(*p)->srw_version))
;
else if (match_xsd_string(ptr, "operationStatus", o,
- &res->operationStatus ))
+ &res->operationStatus ))
;
- else if (match_xsd_string(ptr, "recordId", o,
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
&res->recordId))
;
- else if (match_xsd_string(ptr, "recordVersion", o,
- &res->recordVersion ))
- ;
+ else if (match_element(ptr, "recordVersions" ))
+ yaz_srw_versions(o, ptr, &res->recordVersions,
+ &res->num_recordVersions,
+ client_data, ns_ucp_str);
else if (match_element(ptr, "record"))
- yaz_srw_record(o, ptr, &res->record, &res->extra_record,
- client_data, ns);
+ {
+ res->record = yaz_srw_get_record(o);
+ yaz_srw_record(o, ptr, res->record, &res->extra_record,
+ client_data, ns_ucp_str);
+ }
else if (match_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
- client_data, ns);
+ client_data, ns_ucp_str);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainUpdateRequest"))
else if (o->direction == ODR_ENCODE)
{
Z_SRW_PDU **p = handler_data;
- xmlNsPtr ns_srw;
+ xmlNsPtr ns_ucp, ns_srw;
+
if ((*p)->which == Z_SRW_update_request)
{
Z_SRW_updateRequest *req = (*p)->u.update_request;
xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "updateRequest", 0);
- ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zu");
- xmlSetNs(ptr, ns_srw);
+ 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(ptr, "version", (*p)->srw_version);
+ add_xsd_string_ns(ptr, "version", (*p)->srw_version, ns_srw);
+ add_xsd_string(ptr, "action", req->operation);
+ add_xsd_string(ptr, "recordIdentifier", req->recordId );
+ if (req->recordVersions)
+ yaz_srw_versions( o, ptr, &req->recordVersions,
+ &req->num_recordVersions,
+ client_data, ns_ucp_str);
+ if (req->record && req->record->recordData_len)
+ {
+ 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);
+ }
+ if (req->extraRequestData_len)
+ {
+ add_XML_n(ptr, "extraRequestData",
+ req->extraRequestData_buf,
+ req->extraRequestData_len, ns_srw);
+ }
add_xsd_string(ptr, "stylesheet", req->stylesheet);
add_xsd_string(ptr, "database", req->database);
}
Z_SRW_updateResponse *res = (*p)->u.update_response;
xmlNodePtr ptr = xmlNewChild(pptr, 0, (xmlChar *)
"updateResponse", 0);
- ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zu");
- xmlSetNs(ptr, ns_srw);
+ 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(ptr, "version", (*p)->srw_version);
+ add_xsd_string_ns(ptr, "version", (*p)->srw_version, ns_srw);
add_xsd_string(ptr, "operationStatus", res->operationStatus );
- add_xsd_string(ptr, "recordId", res->recordId );
- if (res->recordVersion)
- add_xsd_string(ptr, "recordVersion", res->recordVersion );
- if (res->recordChecksum)
- add_xsd_string(ptr, "recordChecksum", res->recordChecksum );
- if (res->record.recordData_len)
+ add_xsd_string(ptr, "recordIdentifier", res->recordId );
+ if (res->recordVersions)
+ yaz_srw_versions(o, ptr, &res->recordVersions,
+ &res->num_recordVersions,
+ client_data, ns_ucp_str);
+ if (res->record && res->record->recordData_len)
{
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
- yaz_srw_record(o, rptr, &res->record, &res->extra_record,
- client_data, ns);
+ xmlSetNs(rptr, ns_srw);
+ yaz_srw_record(o, rptr, res->record, &res->extra_record,
+ client_data, ns_ucp_str);
}
if (res->num_diagnostics)
{
- xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "diagnostics", 0);
+ 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);
+ &res->num_diagnostics, client_data,
+ ns_ucp_str);
}
- if ( res->extraResponseData )
- add_xsd_string(ptr, "extraResponseData", res->extraResponseData);
+ if (res->extraResponseData_len)
+ add_XML_n(ptr, "extraResponseData",
+ res->extraResponseData_buf,
+ res->extraResponseData_len, ns_srw);
}
else
return -1;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff