-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
- *
- * $Id: srw.c,v 1.41 2005-11-28 13:21:38 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>
-#if HAVE_XML2
+#include <yaz/wrbuf.h>
+#if YAZ_HAVE_XML2
#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)
-{
- if (val)
- {
- xmlDocPtr doc = xmlParseMemory(val,len);
- if (doc)
- {
- xmlNodePtr c = xmlNewChild(ptr, 0, BAD_CAST elem, 0);
- xmlNodePtr t = xmlDocGetRootElement(doc);
- xmlAddChild(c, xmlCopyNode(t,1));
- xmlFreeDoc(doc);
- }
- }
-}
-
-xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, const char *val,
- int len)
-{
- if (val)
- {
- xmlNodePtr c = xmlNewChild(ptr, 0, BAD_CAST elem, 0);
- xmlNodePtr t = xmlNewTextLen(BAD_CAST val, len);
- xmlAddChild(c, t);
- return t;
- }
- return 0;
-}
-
-xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
-{
- if (val)
- return xmlNewTextChild(ptr, 0, BAD_CAST elem,
- BAD_CAST val);
- return 0;
-}
-
-static void add_xsd_integer(xmlNodePtr ptr, const char *elem, const int *val)
-{
- if (val)
- {
- char str[30];
- sprintf(str, "%d", *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;
-}
-
-#define CHECK_TYPE 0
-
-static int match_xsd_string_n(xmlNodePtr ptr, const char *elem, ODR o,
- char **val, int *len)
-{
-#if CHECK_TYPE
- struct _xmlAttr *attr;
-#endif
- if (!match_element(ptr, elem))
- return 0;
-#if CHECK_TYPE
- for (attr = ptr->properties; attr; attr = attr->next)
- if (!strcmp(attr->name, "type") &&
- attr->children && attr->children->type == XML_TEXT_NODE)
- {
- const char *t = strchr(attr->children->content, ':');
- if (t)
- t = t + 1;
- else
- t = attr->children->content;
- if (!strcmp(t, "string"))
- break;
- }
- if (!attr)
- return 0;
-#endif
- ptr = ptr->children;
- if (!ptr || ptr->type != XML_TEXT_NODE)
- {
- *val = "";
- return 1;
- }
- *val = odr_strdup(o, (const char *) ptr->content);
- if (len)
- *len = xmlStrlen(ptr->content);
- return 1;
-}
-
-
-static int match_xsd_string(xmlNodePtr ptr, const char *elem, ODR o,
- char **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)
+char *yaz_negotiate_sru_version(char *input_ver)
{
- xmlBufferPtr buf;
-
- 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();
-
- xmlNodeDump(buf, ptr->doc, ptr, 0, 0);
-
- *val = odr_malloc(o, buf->use+1);
- memcpy (*val, buf->content, buf->use);
- (*val)[buf->use] = '\0';
-
- if (len)
- *len = buf->use;
-
- xmlBufferFree(buf);
-
- return 1;
-}
-
-static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o, int **val)
-{
-#if CHECK_TYPE
- struct _xmlAttr *attr;
-#endif
- if (!match_element(ptr, elem))
- return 0;
-#if CHECK_TYPE
- for (attr = ptr->properties; attr; attr = attr->next)
- if (!strcmp(attr->name, "type") &&
- attr->children && attr->children->type == XML_TEXT_NODE)
- {
- const char *t = strchr(attr->children->content, ':');
- if (t)
- t = t + 1;
- else
- t = attr->children->content;
- if (!strcmp(t, "integer"))
- break;
- }
- if (!attr)
- return 0;
-#endif
- ptr = ptr->children;
- if (!ptr || ptr->type != XML_TEXT_NODE)
- return 0;
- *val = odr_intdup(o, 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)
-{
- 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);
- }
+ if (!input_ver)
+ return "2.0";
+ if (!strcmp(input_ver, "1.1"))
+ return "1.1";
+ 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;
rec->recordPosition = 0;
*extra = 0;
+
+ ex.extraRecordData_buf = 0;
+ ex.extraRecordData_len = 0;
+ ex.recordIdentifier = 0;
+
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
-
- if (match_xsd_string(ptr, "recordSchema", o,
- &rec->recordSchema))
+
+ if (yaz_match_xsd_string(ptr, "recordSchema", o,
+ &rec->recordSchema))
;
- 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;
- }
- else if (match_xsd_integer(ptr, "recordPosition", o,
- &rec->recordPosition))
+ else if (yaz_match_xsd_string(ptr, "recordPacking", o, &spack))
+ ; /* can't rely on it: in SRU 2.0 it's different semantics */
+ else if (yaz_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;
- }
- else if (match_element(ptr, "extraRecordData"))
+ else if (yaz_match_xsd_element(ptr, "recordData"))
{
- *extra = (Z_SRW_extra_record *)
- odr_malloc(o, sizeof(Z_SRW_extra_record));
- yaz_srw_extra_record(o, ptr, *extra, client_data, ns);
+ /* 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)
+ {
+ yaz_match_xsd_XML_n2(
+ ptr, "recordData", o,
+ &rec->recordData_buf, &rec->recordData_len, 1);
+ rec->recordPacking = Z_SRW_recordPacking_XML;
+ }
+ else
+ {
+ yaz_match_xsd_string_n(
+ ptr, "recordData", o,
+ &rec->recordData_buf, &rec->recordData_len);
+ rec->recordPacking = Z_SRW_recordPacking_string;
+ }
}
+ else if (yaz_match_xsd_XML_n(ptr, "extraRecordData", o,
+ &ex.extraRecordData_buf,
+ &ex.extraRecordData_len) )
+ ;
+ else
+ yaz_match_xsd_string(ptr, "recordIdentifier", o,
+ &ex.recordIdentifier);
}
- if (data_ptr)
+ if (ex.extraRecordData_buf || ex.recordIdentifier)
{
- 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;
- }
+ *extra = (Z_SRW_extra_record *)
+ odr_malloc(o, sizeof(Z_SRW_extra_record));
+ memcpy(*extra, &ex, sizeof(Z_SRW_extra_record));
}
- rec->recordPacking = pack;
}
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);
- switch(pack)
+ /* recordSchema and recordData are required */
+ if (!rec->recordSchema)
+ xmlNewChild(ptr, 0, BAD_CAST "recordSchema", 0);
+ else
+ add_xsd_string(ptr, "recordSchema", rec->recordSchema);
+ if (spack)
{
- 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);
- 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;
+ if (version2)
+ add_xsd_string(ptr, "recordXMLEscaping", spack);
+ else
+ add_xsd_string(ptr, "recordPacking", spack);
+ }
+ if (!rec->recordData_buf)
+ xmlNewChild(ptr, 0, BAD_CAST "recordData", 0);
+ else
+ {
+ switch (pack)
+ {
+ case Z_SRW_recordPacking_string:
+ add_xsd_string_n(ptr, "recordData", rec->recordData_buf,
+ rec->recordData_len);
+ break;
+ case Z_SRW_recordPacking_XML:
+ add_XML_n(ptr, "recordData", rec->recordData_buf,
+ rec->recordData_len, 0);
+ break;
+ case Z_SRW_recordPacking_URL:
+ add_xsd_string_n(ptr, "recordData", rec->recordData_buf,
+ rec->recordData_len);
+ break;
+ }
}
if (rec->recordPosition)
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;
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;
}
-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 (yaz_match_xsd_string(ptr, "versionType", o,
+ &rec->versionType))
+ ;
+ else
+ yaz_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)
+{
+ Odr_int freq;
+ xmlNodePtr child;
+ WRBUF wrbuf = wrbuf_alloc();
+ Z_FacetTerm *facet_term;
+ const char *freq_string = yaz_element_attribute_value_get(
+ node, "facetvalue", "est_representation");
+ if (freq_string)
+ freq = odr_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);
+ }
+ facet_term = facet_term_create_cstr(odr, wrbuf_cstr(wrbuf), freq);
+ wrbuf_destroy(wrbuf);
+ return facet_term;
+}
+
+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_attribute_create(odr, name);
+ for (node = ptr->children; node; node = node->next) {
+ if (yaz_match_xsd_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 (yaz_match_xsd_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 (yaz_match_xsd_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 (yaz_match_xsd_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,
+ if (yaz_match_xsd_string(rptr, "uri", o, &(*recs)[i].uri))
+ ;
+ else if (yaz_match_xsd_string(rptr, "details", o,
&(*recs)[i].details))
- ;
- else if (match_xsd_string(rptr, "message", o,
- &(*recs)[i].message))
- ;
- }
- i++;
+ ;
+ else
+ yaz_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);
}
term->whereInList = 0;
for (ptr = pptr->children; ptr; ptr = ptr->next)
{
- if (match_xsd_string(ptr, "value", o, &term->value))
+ if (yaz_match_xsd_string(ptr, "value", o, &term->value))
;
- else if (match_xsd_integer(ptr, "numberOfRecords", o,
- &term->numberOfRecords))
+ else if (yaz_match_xsd_integer(ptr, "numberOfRecords", o,
+ &term->numberOfRecords))
;
- else if (match_xsd_string(ptr, "displayTerm", o,
- &term->displayTerm))
- ;
- else if (match_xsd_string(ptr, "whereInList", o,
- &term->whereInList))
+ else if (yaz_match_xsd_string(ptr, "displayTerm", o,
+ &term->displayTerm))
;
+ else
+ yaz_match_xsd_string(ptr, "whereInList", o, &term->whereInList);
}
}
else if (o->direction == ODR_ENCODE)
{
Z_SRW_PDU **p = handler_data;
xmlNodePtr method = pptr->children;
+ char *neg_version;
while (method && method->type == XML_TEXT_NODE)
method = method->next;
-
+
if (!method)
return -1;
if (method->type != XML_ELEMENT_NODE)
return -1;
- *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(**p));
- (*p)->srw_version = odr_strdup(o, "1.1");
-
+ *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;
+ const char *facetStart = 0;
+ const char *facetSort = 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;
for (; ptr; ptr = ptr->next)
{
- if (match_xsd_string(ptr, "version", o,
+ if (yaz_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_integer(ptr, "startRecord", o,
+ else if (yaz_match_xsd_string(ptr, "queryType", o,
+ &req->queryType))
+ ;
+ else if (yaz_match_xsd_string(ptr, "query", o,
+ &req->query))
+ ;
+ else if (yaz_match_xsd_string(ptr, "pQuery", o,
+ &req->query))
+ req->queryType = "pqf";
+ else if (yaz_match_xsd_string(ptr, "xQuery", o,
+ &req->query))
+ req->queryType = "xcql";
+ else if (yaz_match_xsd_integer(ptr, "startRecord", o,
&req->startRecord))
;
- else if (match_xsd_integer(ptr, "maximumRecords", o,
+ else if (yaz_match_xsd_integer(ptr, "maximumRecords", o,
&req->maximumRecords))
;
- else if (match_xsd_string(ptr, "recordPacking", o,
- &req->recordPacking))
+ else if (yaz_match_xsd_string(ptr, "recordPacking", o,
+ &recordPacking))
;
- else if (match_xsd_string(ptr, "recordSchema", o,
+ else if (yaz_match_xsd_string(ptr, "recordXMLEscaping", o,
+ &recordXMLEscaping))
+ ;
+ else if (yaz_match_xsd_string(ptr, "recordSchema", o,
&req->recordSchema))
;
- else if (match_xsd_string(ptr, "recordXPath", o,
+ else if (yaz_match_xsd_string(ptr, "recordXPath", o,
&req->recordXPath))
;
- else if (match_xsd_string(ptr, "resultSetTTL", o,
- &req->database))
+ else if (yaz_match_xsd_integer(ptr, "resultSetTTL", o,
+ &req->resultSetTTL))
;
- else if (match_xsd_string(ptr, "sortKeys", o,
+ else if (yaz_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 if (yaz_match_xsd_string(ptr, "stylesheet", o,
+ &req->stylesheet))
+ ;
+ else if (yaz_match_xsd_string(ptr, "database", o,
+ &req->database))
+ ;
+ else if (yaz_match_xsd_string(ptr, "facetLimit", o,
+ (char**) &facetLimit))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ else if (yaz_match_xsd_string(ptr, "facetStart", o,
+ (char**) &facetStart))
;
- /* missing is xQuery, xSortKeys .. */
+ else if (yaz_match_xsd_string(ptr, "facetSort", o,
+ (char**) &facetSort))
+ ;
+ }
+ 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, &facetStart,
+ &facetSort);
}
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->diagnostics = 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,
+ if (yaz_match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_integer(ptr, "numberOfRecords", o,
- &res->numberOfRecords))
+ else if (yaz_match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
+ else if (yaz_match_xsd_integer(ptr, "numberOfRecords", o,
+ &res->numberOfRecords))
+ ;
+ else if (yaz_match_xsd_string(ptr, "resultCountPrecision", o,
+ &res->resultCountPrecision))
;
- else if (match_xsd_string(ptr, "resultSetId", o,
+ else if (yaz_match_xsd_string(ptr, "resultSetId", o,
&res->resultSetId))
;
- else if (match_xsd_integer(ptr, "resultSetIdleTime", o,
+ else if (yaz_match_xsd_integer(ptr, "resultSetIdleTime", o,
&res->resultSetIdleTime))
;
- else if (match_element(ptr, "records"))
+ else if (yaz_match_xsd_integer(ptr, "resultSetTTL", o,
+ &res->resultSetIdleTime))
+ ;
+ else if (yaz_match_xsd_element(ptr, "records"))
yaz_srw_records(o, ptr, &res->records,
- &res->extra_records,
- &res->num_records, client_data, ns);
- else if (match_xsd_integer(ptr, "nextRecordPosition", o,
+ &res->extra_records,
+ &res->num_records, client_data, 0);
+ else if (yaz_match_xsd_integer(ptr, "nextRecordPosition", o,
&res->nextRecordPosition))
;
- else if (match_element(ptr, "diagnostics"))
+ else if (yaz_match_xsd_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
client_data, ns);
+ else if (yaz_match_xsd_element(ptr, "facet_analysis"))
+ yaz_sru_proxy_decode_facets(o, ptr, &res->facetList);
+ else if (yaz_match_xsd_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))
+ if (yaz_match_xsd_string(ptr, "version", o,
+ &(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "stylesheet", o,
- &req->stylesheet))
+ else if (yaz_match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
;
- else if (match_xsd_string(ptr, "recordPacking", o,
- &req->recordPacking))
+ else if (yaz_match_xsd_string(ptr, "stylesheet", o,
+ &req->stylesheet))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ else if (yaz_match_xsd_string(ptr, "recordPacking", o,
+ &req->recordPacking))
;
+ else
+ yaz_match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "explainResponse"))
for (; ptr; ptr = ptr->next)
{
- if (match_xsd_string(ptr, "version", o,
- &(*p)->srw_version))
+ if (yaz_match_xsd_string(ptr, "version", o,
+ &(*p)->srw_version))
+ ;
+ else if (yaz_match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
;
- else if (match_element(ptr, "record"))
+ else if (yaz_match_xsd_element(ptr, "record"))
yaz_srw_record(o, ptr, &res->record, &res->extra_record,
- client_data, ns);
- else if (match_element(ptr, "diagnostics"))
+ client_data, 0);
+ else if (yaz_match_xsd_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
client_data, ns);
(*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,
+ if (yaz_match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "scanClause", o,
- &req->scanClause.cql))
+ else if (yaz_match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
+ else if (yaz_match_xsd_string(ptr, "scanClause", o,
+ &req->scanClause))
;
- else if (match_xsd_string(ptr, "pScanClause", o,
- &req->scanClause.pqf))
+ else if (yaz_match_xsd_string(ptr, "pScanClause", o,
+ &req->scanClause))
{
- req->query_type = Z_SRW_query_type_pqf;
+ req->queryType = "pqf";
}
- else if (match_xsd_integer(ptr, "responsePosition", o,
+ else if (yaz_match_xsd_integer(ptr, "responsePosition", o,
&req->responsePosition))
;
- else if (match_xsd_integer(ptr, "maximumTerms", o,
+ else if (yaz_match_xsd_integer(ptr, "maximumTerms", o,
&req->maximumTerms))
;
- else if (match_xsd_string(ptr, "stylesheet", o,
+ else if (yaz_match_xsd_string(ptr, "stylesheet", o,
&req->stylesheet))
;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
- ;
+ else
+ yaz_match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "scanResponse"))
res->num_terms = 0;
res->diagnostics = 0;
res->num_diagnostics = 0;
-
+
for (; ptr; ptr = ptr->next)
{
- if (match_xsd_string(ptr, "version", o,
+ if (yaz_match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_element(ptr, "terms"))
+ else if (yaz_match_xsd_XML_n(ptr, "extraResponseData", o,
+ &(*p)->extraResponseData_buf,
+ &(*p)->extraResponseData_len))
+ ;
+ else if (yaz_match_xsd_element(ptr, "terms"))
yaz_srw_terms(o, ptr, &res->terms,
&res->num_terms, client_data,
ns);
- else if (match_element(ptr, "diagnostics"))
+ else if (yaz_match_xsd_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
client_data, ns);
*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;
+ 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;
- xmlNodePtr ptr = xmlNewChild(pptr, 0,
- BAD_CAST "searchRetrieveRequest", 0);
+ 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;
+ const char *start = 0;
+ const char *sort = 0;
+ yaz_sru_facet_request(o, &req->facetList, &limit, &start,
+ &sort);
+ add_xsd_string(ptr, "facetLimit", limit);
+ add_xsd_string(ptr, "facetStart", start);
+ add_xsd_string(ptr, "facetSort", sort);
+ }
}
else if ((*p)->which == Z_SRW_searchRetrieve_response)
{
Z_SRW_searchRetrieveResponse *res = (*p)->u.response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0,
- BAD_CAST "searchRetrieveResponse", 0);
+ 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)
{
Z_SRW_explainRequest *req = (*p)->u.explain_request;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "explainRequest",
- 0);
+ if (version2)
+ ns = "http://docs.oasis-open.org/ns/search-ws/sruRequest";
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "explainRequest", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
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);
}
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);
+ if (version2)
+ ns = "http://docs.oasis-open.org/ns/search-ws/sruResponse";
+ ptr = xmlNewChild(pptr, 0, BAD_CAST "explainResponse", 0);
ns_srw = xmlNewNs(ptr, BAD_CAST ns, BAD_CAST "zs");
xmlSetNs(ptr, ns_srw);
{
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;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "scanRequest", 0);
+ 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;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "scanResponse", 0);
+ 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,
+ (*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;
while (method && method->type == XML_TEXT_NODE)
method = method->next;
-
+
if (!method)
return -1;
if (method->type != XML_ELEMENT_NODE)
return -1;
- *p = (Z_SRW_PDU *) odr_malloc(o, sizeof(**p));
- (*p)->srw_version = odr_strdup(o, "1.1");
-
+ *p = yaz_srw_get_core_v_2_0(o);
+
if (!xmlStrcmp(method->name, BAD_CAST "updateRequest"))
{
xmlNodePtr ptr = method->children;
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,
+ if (yaz_match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "operation", o,
+ else if (yaz_match_xsd_string(ptr, "action", o,
&oper)){
- if ( oper ){
- if ( !strcmp(oper, "delete"))
+ if (oper)
+ {
+ 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 (yaz_match_xsd_string(ptr, "recordIdentifier", o,
&req->recordId))
;
- else if (match_xsd_string(ptr, "recordVersion", o,
- &req->recordVersion))
- ;
- else if (match_element(ptr, "record"))
- yaz_srw_record(o, ptr, &req->record, &req->extra_record,
- client_data, ns);
- else if (match_xsd_string(ptr, "stylesheet", o,
- &req->stylesheet))
- ;
- else if (match_xsd_string(ptr, "database", o,
- &req->database))
+ else if (yaz_match_xsd_element(ptr, "recordVersions" ) )
+ yaz_srw_versions( o, ptr, &req->recordVersions,
+ &req->num_recordVersions, client_data,
+ ns_ucp_str);
+ else if (yaz_match_xsd_element(ptr, "record"))
+ {
+ req->record = yaz_srw_get_record(o);
+ yaz_srw_record(o, ptr, req->record, &req->extra_record,
+ client_data, 0);
+ }
+ else if (yaz_match_xsd_string(ptr, "stylesheet", o,
+ &req->stylesheet))
;
+ else
+ yaz_match_xsd_string(ptr, "database", o, &req->database);
}
}
else if (!xmlStrcmp(method->name, BAD_CAST "updateResponse"))
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)
{
- if (match_xsd_string(ptr, "version", o,
+ if (yaz_match_xsd_string(ptr, "version", o,
&(*p)->srw_version))
;
- else if (match_xsd_string(ptr, "operationStatus", o,
- &res->operationStatus ))
+ else if (yaz_match_xsd_string(ptr, "operationStatus", o,
+ &res->operationStatus ))
;
- else if (match_xsd_string(ptr, "recordId", o,
+ else if (yaz_match_xsd_string(ptr, "recordIdentifier", o,
&res->recordId))
;
- else if (match_xsd_string(ptr, "recordVersion", o,
- &res->recordVersion ))
- ;
- else if (match_element(ptr, "record"))
- yaz_srw_record(o, ptr, &res->record, &res->extra_record,
- client_data, ns);
- else if (match_element(ptr, "diagnostics"))
+ else if (yaz_match_xsd_element(ptr, "recordVersions" ))
+ yaz_srw_versions(o, ptr, &res->recordVersions,
+ &res->num_recordVersions,
+ client_data, ns_ucp_str);
+ else if (yaz_match_xsd_element(ptr, "record"))
+ {
+ res->record = yaz_srw_get_record(o);
+ yaz_srw_record(o, ptr, res->record, &res->extra_record,
+ client_data, 0);
+ }
+ else if (yaz_match_xsd_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, "updateRequest", 0);
- ns_srw = xmlNewNs(ptr, ns, "zu");
- xmlSetNs(ptr, ns_srw);
+ xmlNodePtr ptr = xmlNewChild(pptr, 0, BAD_CAST "updateRequest", 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(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, 0);
+ }
+ 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);
}
else if ((*p)->which == Z_SRW_update_response)
{
Z_SRW_updateResponse *res = (*p)->u.update_response;
- xmlNodePtr ptr = xmlNewChild(pptr, 0, "updateResponse", 0);
- ns_srw = xmlNewNs(ptr, ns, "zu");
- xmlSetNs(ptr, ns_srw);
-
- add_xsd_string(ptr, "version", (*p)->srw_version);
+ 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, "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, "record", 0);
- yaz_srw_record(o, rptr, &res->record, &res->extra_record,
- client_data, ns);
+ 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, 0);
}
if (res->num_diagnostics)
{
- xmlNodePtr rptr = xmlNewChild(ptr, 0, "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;
-
}
return 0;
}
/*
* 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