/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: srw.c,v 1.45 2006-05-07 14:31:30 adam Exp $
+ * $Id: srw.c,v 1.51 2006-11-30 22:58:06 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)
{
return match_xsd_string_n(ptr, elem, o, val, 0);
}
+
+/** \brief fixes NS for root node of record data (bug #740) */
+static void fixup_xmlns(xmlNodePtr ptr, ODR o)
+{
+ /* should go towards root and collect NS not defined in the record here! */
+ xmlNodePtr p = ptr;
+
+ while (p)
+ {
+ assert(p->type == XML_ELEMENT_NODE);
+
+ p = p->parent;
+ while (p && p->type != XML_ELEMENT_NODE)
+ p = p->prev;
+ if (p)
+ {
+ xmlNsPtr ns = p->ns;
+ for (; ns; ns = ns->next)
+ {
+ xmlNsPtr n;
+ for (n = ptr->nsDef; n; n = n->next)
+ if ((n->prefix == 0 && ns->prefix == 0)
+ || (n->prefix && ns->prefix
+ && !strcmp((const char *) n->prefix,
+ (const char *) ns->prefix)))
+ {
+ break;
+ }
+ if (!n)
+ {
+ xmlNsPtr new_ns = xmlCopyNamespace(ns);
+
+ new_ns->next = ptr->nsDef;
+ ptr->nsDef = new_ns;
+ }
+ }
+ }
+ }
+}
+
static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o,
char **val, int *len)
{
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;
+
+ fixup_xmlns(ptr, o);
+
buf = xmlBufferCreate();
-
+
xmlNodeDump(buf, ptr->doc, ptr, 0, 0);
*val = odr_malloc(o, buf->use+1);
{
if (match_xsd_string(ptr, "recordId", o,
&rec->recordId ))
+ ; /* backward compatible */
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
+ &rec->recordId ))
;
else if (match_xsd_string(ptr, "recordReviewCode", o,
&rec->recordReviewCode ))
{
xmlNodePtr ptr = pptr;
if ( rec->recordId )
- add_xsd_string(ptr, "recordId", rec->recordId);
+ add_xsd_string(ptr, "recordIdentfier", rec->recordId);
if ( rec->recordReviewCode )
add_xsd_string(ptr, "recordReviewCode", rec->recordReviewCode);
if ( rec->recordReviewNote )
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)->username = 0;
- (*p)->password = 0;
+ *p = yaz_srw_get_core_v_1_1(o);
if (!xmlStrcmp(method->name, BAD_CAST "searchRetrieveRequest"))
{
&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"))
{
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 "updateRequest"))
{
;
else if (match_xsd_string(ptr, "operation", o,
&oper)){
+ /* backward compatible */
if ( oper ){
if ( !strcmp(oper, "delete"))
req->operation = "delete";
req->operation = "insert";
}
}
+ 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, "recordId", o,
&req->recordId))
+ ; /* backward compatible */
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
+ &req->recordId))
;
else if (match_xsd_string(ptr, "recordVersion", o,
&req->recordVersion))
;
else if (match_xsd_string(ptr, "recordId", o,
&res->recordId))
+ ; /* backward compatible */
+ else if (match_xsd_string(ptr, "recordIdentifier", o,
+ &res->recordId))
;
else if (match_xsd_string(ptr, "recordVersion", o,
&res->recordVersion ))
add_xsd_string(ptr, "version", (*p)->srw_version);
add_xsd_string(ptr, "operationStatus", res->operationStatus );
- add_xsd_string(ptr, "recordId", res->recordId );
+ add_xsd_string(ptr, "recordIdentifier", res->recordId );
if (res->recordVersion)
add_xsd_string(ptr, "recordVersion", res->recordVersion );
if (res->recordChecksum)