-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
- *
- * $Id: soap.c,v 1.11 2005-06-25 15:46:05 adam Exp $
*/
/**
* \file soap.c
* This implements encoding and decoding of SOAP packages using
* Libxml2.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/soap.h>
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
if (!doc)
return z_soap_error(o, p, "SOAP-ENV:Client",
"Bad XML Document", 0);
- /* check that root node is Envelope */
+
ptr = xmlDocGetRootElement(doc);
+ if (!ptr || !ptr->ns)
+ {
+ xmlFreeDoc(doc);
+ return z_soap_error(o, p, "SOAP-ENV:Client",
+ "No Envelope element", 0);
+ }
+ /* check for SRU root node match */
+
+ for (i = 0; handlers[i].ns; i++)
+ if (!xmlStrcmp(ptr->ns->href, BAD_CAST handlers[i].ns))
+ break;
+ if (handlers[i].ns)
+ {
+ void *handler_data = 0;
+ xmlNode p_top_tmp; /* pseudo parent node needed */
+
+ p_top_tmp.children = ptr;
+ ret = (*handlers[i].f)(o, &p_top_tmp, &handler_data,
+ handlers[i].client_data,
+ handlers[i].ns);
+
+ if (ret || !handler_data)
+ z_soap_error(o, p, "SOAP-ENV:Client",
+ "SOAP Handler returned error", 0);
+ else
+ {
+ p->which = Z_SOAP_generic;
+ p->u.generic = (Z_SOAP_Generic *)
+ odr_malloc(o, sizeof(*p->u.generic));
+ p->u.generic->no = i;
+ p->u.generic->ns = handlers[i].ns;
+ p->u.generic->p = handler_data;
+ }
+ xmlFreeDoc(doc);
+ return ret;
+ }
+ /* OK: assume SOAP */
+
if (!ptr || ptr->type != XML_ELEMENT_NODE ||
- strcmp(ptr->name, "Envelope") || !ptr->ns)
+ xmlStrcmp(ptr->name, BAD_CAST "Envelope") || !ptr->ns)
{
xmlFreeDoc(doc);
return z_soap_error(o, p, "SOAP-ENV:Client",
else
{
/* determine SOAP version */
- const char * ns_envelope = ptr->ns->href;
+ const char * ns_envelope = (const char *) ptr->ns->href;
if (!strcmp(ns_envelope, soap_v1_1))
p->ns = soap_v1_1;
else if (!strcmp(ns_envelope, soap_v1_2))
while(ptr && ptr->type == XML_TEXT_NODE)
ptr = ptr->next;
if (ptr && ptr->type == XML_ELEMENT_NODE &&
- !strcmp(ptr->ns->href, p->ns) &&
- !strcmp(ptr->name, "Header"))
+ !xmlStrcmp(ptr->ns->href, BAD_CAST p->ns) &&
+ !xmlStrcmp(ptr->name, BAD_CAST "Header"))
{
ptr = ptr->next;
while(ptr && ptr->type == XML_TEXT_NODE)
}
/* check that Body is present */
if (!ptr || ptr->type != XML_ELEMENT_NODE ||
- strcmp(ptr->name, "Body"))
+ xmlStrcmp(ptr->name, BAD_CAST "Body"))
{
xmlFreeDoc(doc);
return z_soap_error(o, p, "SOAP-ENV:Client",
"SOAP Body element not found", 0);
}
- if (strcmp(ptr->ns->href, p->ns))
+ if (xmlStrcmp(ptr->ns->href, BAD_CAST p->ns))
{
xmlFreeDoc(doc);
return z_soap_error(o, p, "SOAP-ENV:Client",
"SOAP No namespace for content", 0);
}
/* check for fault package */
- if (!strcmp(ptr->ns->href, p->ns)
- && !strcmp(ptr->name, "Fault") && ptr->children)
+ if (!xmlStrcmp(ptr->ns->href, BAD_CAST p->ns)
+ && !xmlStrcmp(ptr->name, BAD_CAST "Fault") && ptr->children)
{
ptr = ptr->children;
{
if (ptr->children && ptr->children->type == XML_TEXT_NODE)
{
- if (!strcmp(ptr->name, "faultcode"))
+ if (!xmlStrcmp(ptr->name, BAD_CAST "faultcode"))
p->u.fault->fault_code =
- odr_strdup(o, ptr->children->content);
- if (!strcmp(ptr->name, "faultstring"))
+ odr_strdup(o, (const char *)
+ ptr->children->content);
+ if (!xmlStrcmp(ptr->name, BAD_CAST "faultstring"))
p->u.fault->fault_string =
- odr_strdup(o, ptr->children->content);
- if (!strcmp(ptr->name, "details"))
+ odr_strdup(o, (const char *)
+ ptr->children->content);
+ if (!xmlStrcmp(ptr->name, BAD_CAST "details"))
p->u.fault->details =
- odr_strdup(o, ptr->children->content);
+ odr_strdup(o, (const char *)
+ ptr->children->content);
}
ptr = ptr->next;
}
else
{
for (i = 0; handlers[i].ns; i++)
- if (!strcmp(ptr->ns->href, handlers[i].ns))
+ if (!xmlStrcmp(ptr->ns->href, BAD_CAST handlers[i].ns))
break;
if (handlers[i].ns)
{
else
{
ret = z_soap_error(o, p, "SOAP-ENV:Client",
- "No handler for NS", ptr->ns->href);
+ "No handler for NS",
+ (const char *)ptr->ns->href);
}
}
xmlFreeDoc(doc);
xmlNsPtr ns_env;
xmlNodePtr envelope_ptr, body_ptr;
- xmlDocPtr doc = xmlNewDoc("1.0");
+ xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0");
- envelope_ptr = xmlNewNode(0, "Envelope");
- ns_env = xmlNewNs(envelope_ptr, p->ns, "SOAP-ENV");
+ envelope_ptr = xmlNewNode(0, BAD_CAST "Envelope");
+ ns_env = xmlNewNs(envelope_ptr, BAD_CAST p->ns,
+ BAD_CAST "SOAP-ENV");
xmlSetNs(envelope_ptr, ns_env);
- body_ptr = xmlNewChild(envelope_ptr, ns_env, "Body", 0);
+ body_ptr = xmlNewChild(envelope_ptr, ns_env, BAD_CAST "Body",
+ 0);
xmlDocSetRootElement(doc, envelope_ptr);
if (p->which == Z_SOAP_fault || p->which == Z_SOAP_error)
{
Z_SOAP_Fault *f = p->u.fault;
- xmlNodePtr fault_ptr = xmlNewChild(body_ptr, ns_env, "Fault", 0);
- xmlNewChild(fault_ptr, ns_env, "faultcode", f->fault_code);
- xmlNewChild(fault_ptr, ns_env, "faultstring", f->fault_string);
+ xmlNodePtr fault_ptr = xmlNewChild(body_ptr, ns_env,
+ BAD_CAST "Fault", 0);
+ xmlNewChild(fault_ptr, ns_env, BAD_CAST "faultcode",
+ BAD_CAST f->fault_code);
+ xmlNewChild(fault_ptr, ns_env, BAD_CAST "faultstring",
+ BAD_CAST f->fault_string);
if (f->details)
- xmlNewChild(fault_ptr, ns_env, "details", f->details);
+ xmlNewChild(fault_ptr, ns_env, BAD_CAST "details",
+ BAD_CAST f->details);
}
else if (p->which == Z_SOAP_generic)
{
}
if (stylesheet)
{
- char *content = odr_malloc(o, strlen(stylesheet) + 40);
+ char *content = (char *) odr_malloc(o, strlen(stylesheet) + 40);
xmlNodePtr pi, ptr = xmlDocGetRootElement(doc);
sprintf(content, "type=\"text/xsl\" href=\"%s\"", stylesheet);
- pi = xmlNewPI("xml-stylesheet", content);
+ pi = xmlNewPI(BAD_CAST "xml-stylesheet",
+ BAD_CAST content);
xmlAddPrevSibling(ptr, pi);
}
if (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