/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srw.c,v 1.36 2005-08-22 20:34:21 adam Exp $
+ * $Id: srw.c,v 1.54 2007-01-03 08:42:15 adam Exp $
*/
/**
* \file srw.c
*/
#include <yaz/srw.h>
-
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
+#include <assert.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;
}
+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 int *val)
{
if (val)
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;
}
char **val, int *len)
{
xmlBufferPtr buf;
+ xmlNode *tmp;
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;
+
+ /* copy node to get NS right (bug #740). */
+ tmp = xmlCopyNode(ptr, 1);
+
buf = xmlBufferCreate();
- xmlNodeDump(buf, ptr->doc, ptr, 0, 0);
+ xmlNodeDump(buf, tmp->doc, tmp, 0, 0);
+
+ xmlFreeNode(tmp);
*val = odr_malloc(o, buf->use+1);
memcpy (*val, buf->content, buf->use);
}
static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
+ Z_SRW_extra_record **extra,
void *client_data, const char *ns)
{
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;
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)
{
- char *spack = 0;
if (match_xsd_string(ptr, "recordSchema", o,
&rec->recordSchema))
{
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
+ 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_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)
+ {
+ switch(pack)
{
- if (pack == Z_SRW_recordPacking_XML)
- match_xsd_XML_n(ptr, "recordData", o,
- &rec->recordData_buf,
- &rec->recordData_len);
- if (pack == Z_SRW_recordPacking_string)
- match_xsd_string_n(ptr, "recordData", o,
- &rec->recordData_buf,
- &rec->recordData_len);
+ 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 *)
+ 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);
- switch(rec->recordPacking)
+
+ switch(pack)
{
case Z_SRW_recordPacking_string:
add_xsd_string(ptr, "recordPacking", "string");
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 (rec->recordPosition)
+ add_xsd_integer(ptr, "recordPosition", rec->recordPosition );
+ if (extra && *extra)
+ {
+ 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)
{
if (o->direction == ODR_DECODE)
if (!*num)
return 1;
*recs = (Z_SRW_record *) odr_malloc(o, *num * sizeof(**recs));
+ *extra = (Z_SRW_extra_record **) odr_malloc(o, *num * sizeof(**extra));
for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
!xmlStrcmp(ptr->name, BAD_CAST "record"))
{
- yaz_srw_record(o, ptr, (*recs)+i, client_data, ns);
+ yaz_srw_record(o, ptr, *recs + i, *extra + i, client_data, ns);
i++;
}
}
{
xmlNodePtr rptr = xmlNewChild(pptr, 0, BAD_CAST "record",
0);
- yaz_srw_record(o, rptr, (*recs)+i, client_data, ns);
+ yaz_srw_record(o, rptr, (*recs)+i, (*extra ? *extra + i : 0),
+ client_data, ns);
+ }
+ }
+ return 0;
+}
+
+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)
+ {
+ int i;
+ xmlNodePtr ptr;
+ *num = 0;
+ for (ptr = pptr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE &&
+ !xmlStrcmp(ptr->name, BAD_CAST "recordVersion"))
+ (*num)++;
+ }
+ if (!*num)
+ return 1;
+ *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;
{
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 (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_1_1(o);
if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveRequest"))
{
else if (match_xsd_string(ptr, "recordXPath", o,
&req->recordXPath))
;
- else if (match_xsd_string(ptr, "resultSetTTL", o,
- &req->database))
+ else if (match_xsd_integer(ptr, "resultSetTTL", o,
+ &req->resultSetTTL))
;
else if (match_xsd_string(ptr, "sortKeys", o,
&req->sort.sortKeys))
else if (match_xsd_string(ptr, "database", o,
&req->database))
;
- /* missing is xQuery, xSortKeys .. */
+ }
+ 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"))
;
else if (match_element(ptr, "records"))
yaz_srw_records(o, ptr, &res->records,
- &res->num_records, client_data,
- ns);
+ &res->extra_records,
+ &res->num_records, client_data, ns);
else if (match_xsd_integer(ptr, "nextRecordPosition", o,
&res->nextRecordPosition))
;
&(*p)->srw_version))
;
else if (match_element(ptr, "record"))
- yaz_srw_record(o, ptr, &res->record, client_data, ns);
+ yaz_srw_record(o, ptr, &res->record, &res->extra_record,
+ client_data, ns);
else if (match_element(ptr, "diagnostics"))
yaz_srw_diagnostics(o, ptr, &res->diagnostics,
&res->num_diagnostics,
if (res->num_records)
{
xmlNodePtr rptr = xmlNewChild(ptr, 0, BAD_CAST "records", 0);
- yaz_srw_records(o, rptr, &res->records, &res->num_records,
+ yaz_srw_records(o, rptr, &res->records, &res->extra_records,
+ &res->num_records,
client_data, ns);
}
add_xsd_integer(ptr, "nextRecordPosition",
if (1)
{
xmlNodePtr ptr1 = xmlNewChild(ptr, 0, BAD_CAST "record", 0);
- yaz_srw_record(o, ptr1, &res->record, client_data, ns);
+ yaz_srw_record(o, ptr1, &res->record, &res->extra_record,
+ client_data, ns);
}
if (res->num_diagnostics)
{
return 0;
}
+int yaz_ucp_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
+ 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;
+ xmlNodePtr method = pptr->children;
+
+ 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;
+ Z_SRW_updateRequest *req;
+ char *oper = 0;
+
+ (*p)->which = Z_SRW_update_request;
+ req = (*p)->u.update_request = (Z_SRW_updateRequest *)
+ odr_malloc(o, sizeof(*req));
+ req->database = 0;
+ req->operation = 0;
+ req->recordId = 0;
+ req->recordVersions = 0;
+ req->num_recordVersions = 0;
+ req->record = 0;
+ req->extra_record = 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, "action", o,
+ &oper)){
+ 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"))
+ req->operation = "insert";
+ }
+ }
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
+ &req->recordId))
+ ;
+ 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"))
+ {
+ 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))
+ ;
+ else if (match_xsd_string(ptr, "database", o,
+ &req->database))
+ ;
+ }
+ }
+ else if (!xmlStrcmp(method->name, BAD_CAST "updateResponse"))
+ {
+ xmlNodePtr ptr = method->children;
+ Z_SRW_updateResponse *res;
+
+ (*p)->which = Z_SRW_update_response;
+ res = (*p)->u.update_response = (Z_SRW_updateResponse *)
+ odr_malloc(o, sizeof(*res));
+
+ res->operationStatus = 0;
+ res->recordId = 0;
+ res->recordVersions = 0;
+ res->num_recordVersions = 0;
+ res->diagnostics = 0;
+ res->num_diagnostics = 0;
+ res->record = 0;
+ res->extra_record = 0;
+ res->extraResponseData_buf = 0;
+ res->extraResponseData_len = 0;
+
+ for (; ptr; ptr = ptr->next)
+ {
+ if (match_xsd_string(ptr, "version", o,
+ &(*p)->srw_version))
+ ;
+ else if (match_xsd_string(ptr, "operationStatus", o,
+ &res->operationStatus ))
+ ;
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
+ &res->recordId))
+ ;
+ 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"))
+ {
+ 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_ucp_str);
+ }
+ }
+ else if (!xmlStrcmp(method->name, BAD_CAST "explainUpdateRequest"))
+ {
+ }
+ else if (!xmlStrcmp(method->name, BAD_CAST "explainUpdateResponse"))
+ {
+ }
+ else
+ {
+ *p = 0;
+ return -1;
+ }
+ }
+ else if (o->direction == ODR_ENCODE)
+ {
+ 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 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_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);
+ }
+ else if ((*p)->which == Z_SRW_update_response)
+ {
+ Z_SRW_updateResponse *res = (*p)->u.update_response;
+ 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 );
+ 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);
+ xmlSetNs(rptr, ns_srw);
+ yaz_srw_record(o, rptr, res->record, &res->extra_record,
+ client_data, ns_ucp_str);
+ }
+ 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,
+ res->extraResponseData_len, ns_srw);
+ }
+ else
+ return -1;
+
+ }
+ return 0;
+}
+
#endif