/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.hpp"
+
#include <metaproxy/xmlutil.hpp>
#include <string.h>
-
namespace mp = metaproxy_1;
// Doxygen doesn't like mp::xml, so we use this instead
namespace mp_xml = metaproxy_1::xml;
bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
{
+ if (ptr && ptr->type != XML_TEXT_NODE)
+ ptr = ptr->children;
if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
{
- if (!strcmp((const char *) ptr->content, "true"))
+ if (!strcmp((const char *) ptr->content, "true")
+ || !strcmp((const char *) ptr->content, "1"))
return true;
else
return false;
int mp_xml::get_int(const xmlNode *ptr, int default_value)
{
+ if (ptr && ptr->type != XML_TEXT_NODE)
+ ptr = ptr->children;
if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
{
return atoi((const char *) ptr->content);
return default_value;
}
-bool mp_xml::check_attribute(const _xmlAttr *ptr,
+bool mp_xml::check_attribute(const _xmlAttr *ptr,
const std::string &ns,
const std::string &name)
{
-
if (!mp::xml::is_attribute(ptr, ns, name))
- {
+ {
std::string got_attr = "'";
if (ptr && ptr->name)
got_attr += std::string((const char *)ptr->name);
got_attr += std::string((const char *)ptr->ns->href);
}
got_attr += "'";
-
- throw mp::XMLError("Expected XML attribute '" + name
+
+ throw mp::XMLError("Expected XML attribute '" + name
+ " " + ns + "'"
+ ", not " + got_attr);
}
return true;
}
-bool mp_xml::is_attribute(const _xmlAttr *ptr,
+bool mp_xml::is_attribute(const _xmlAttr *ptr,
const std::string &ns,
const std::string &name)
{
if (0 != xmlStrcmp(BAD_CAST name.c_str(), ptr->name))
return false;
- if (ns.size()
- && (!ptr->ns || !ptr->ns->href
+ if (ns.size()
+ && (!ptr->ns || !ptr->ns->href
|| 0 != xmlStrcmp(BAD_CAST ns.c_str(), ptr->ns->href)))
return false;
}
-bool mp_xml::is_element(const xmlNode *ptr,
+bool mp_xml::is_element(const xmlNode *ptr,
const std::string &ns,
const std::string &name)
{
- if (ptr && ptr->type == XML_ELEMENT_NODE && ptr->ns && ptr->ns->href
+ if (ptr && ptr->type == XML_ELEMENT_NODE && ptr->ns && ptr->ns->href
&& !xmlStrcmp(BAD_CAST ns.c_str(), ptr->ns->href)
&& !xmlStrcmp(BAD_CAST name.c_str(), ptr->name))
return true;
return false;
}
-bool mp_xml::is_element_mp(const xmlNode *ptr,
+bool mp_xml::is_element_mp(const xmlNode *ptr,
const std::string &name)
{
return mp::xml::is_element(ptr, metaproxy_ns, name);
}
-bool mp_xml::check_element_mp(const xmlNode *ptr,
+bool mp_xml::check_element_mp(const xmlNode *ptr,
const std::string &name)
{
if (!mp::xml::is_element_mp(ptr, name))
}
got_element += ">";
- throw mp::XMLError("Expected XML element <" + name
+ throw mp::XMLError("Expected XML element <" + name
+ " xmlns=\"" + metaproxy_ns + "\">"
+ ", not " + got_element);
}
return true;
}
-std::string mp_xml::get_route(const xmlNode *node)
+void mp_xml::parse_attr(const xmlNode *node, const char **names,
+ std::string *values)
{
- std::string route_value;
+ size_t i;
+ for (i = 0; names[i]; i++)
+ values[i].clear();
+
if (node)
{
const struct _xmlAttr *attr;
for (attr = node->properties; attr; attr = attr->next)
{
- std::string name = std::string((const char *) attr->name);
std::string value;
-
+ const char *name = (const char *) attr->name;
+
if (attr->children && attr->children->type == XML_TEXT_NODE)
value = std::string((const char *)attr->children->content);
-
- if (name == "route")
- route_value = value;
- else
- throw XMLError("Only attribute route allowed"
- " in " + std::string((const char *)node->name)
- + " element. Got " + std::string(name));
+ for (i = 0; names[i]; i++)
+ if (!strcmp(name, names[i]))
+ {
+ values[i] = value;
+ break;
+ }
+ if (!names[i])
+ {
+ throw XMLError("Unsupported attribute: '" +
+ std::string(name) +
+ "' in element '" +
+ std::string((const char *) node->name) + "'");
+ }
}
}
- return route_value;
}
+std::string mp_xml::get_route(const xmlNode *node, std::string &auth)
+{
+ const char *names[3] = { "route", "auth", 0 };
+ std::string values[2];
+
+ parse_attr(node, names, values);
+
+ auth = values[1];
+ return values[0];
+}
+
+std::string mp_xml::get_route(const xmlNode *node)
+{
+ const char *names[2] = { "route", 0 };
+ std::string values[1];
+
+ parse_attr(node, names, values);
+
+ return values[0];
+}
const xmlNode* mp_xml::jump_to_children(const xmlNode* node,
int xml_node_type)
if (node)
{
const xmlNode *n;
+ const struct _xmlAttr *attr;
+ std::string extra;
+ for (attr = node->properties; attr; attr = attr->next)
+ if (!strcmp((const char *) attr->name, "type"))
+ extra = " of type " + get_text(attr);
for (n = node->children; n; n = n->next)
if (n->type == XML_ELEMENT_NODE)
throw mp::XMLError("No child elements allowed inside element "
- + std::string((const char *) node->name));
+ + std::string((const char *) node->name)
+ + extra);
}
}
projects / metaproxy-moved-to-github.git / blobdiff