projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set yaz_log prefix to PID
[metaproxy-moved-to-github.git]
/
src
/
xmlutil.cpp
diff --git
a/src/xmlutil.cpp
b/src/xmlutil.cpp
index
f211fc4
..
f48868c
100644
(file)
--- a/
src/xmlutil.cpp
+++ b/
src/xmlutil.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2012 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
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
@@
-16,10
+16,11
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "xmlutil.hpp"
+#include "config.hpp"
-#include <string.h>
+#include <metaproxy/xmlutil.hpp>
+#include <string.h>
namespace mp = metaproxy_1;
// Doxygen doesn't like mp::xml, so we use this instead
namespace mp = metaproxy_1;
// Doxygen doesn't like mp::xml, so we use this instead
@@
-45,9
+46,12
@@
std::string mp_xml::get_text(const xmlNode *ptr)
bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
{
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 (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;
return true;
else
return false;
@@
-57,6
+61,8
@@
bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
int mp_xml::get_int(const xmlNode *ptr, int default_value)
{
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);
if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
{
return atoi((const char *) ptr->content);
@@
-64,13
+70,13
@@
int mp_xml::get_int(const xmlNode *ptr, int default_value)
return default_value;
}
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))
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);
std::string got_attr = "'";
if (ptr && ptr->name)
got_attr += std::string((const char *)ptr->name);
@@
-79,23
+85,23
@@
bool mp_xml::check_attribute(const _xmlAttr *ptr,
got_attr += std::string((const char *)ptr->ns->href);
}
got_attr += "'";
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;
}
+ " " + 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;
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;
|| 0 != xmlStrcmp(BAD_CAST ns.c_str(), ptr->ns->href)))
return false;
@@
-103,25
+109,25
@@
bool mp_xml::is_attribute(const _xmlAttr *ptr,
}
}
-bool mp_xml::is_element(const xmlNode *ptr,
+bool mp_xml::is_element(const xmlNode *ptr,
const std::string &ns,
const std::string &name)
{
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;
}
&& !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);
}
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))
const std::string &name)
{
if (!mp::xml::is_element_mp(ptr, name))
@@
-136,14
+142,14
@@
bool mp_xml::check_element_mp(const xmlNode *ptr,
}
got_element += ">";
}
got_element += ">";
- throw mp::XMLError("Expected XML element <" + name
+ throw mp::XMLError("Expected XML element <" + name
+ " xmlns=\"" + metaproxy_ns + "\">"
+ ", not " + got_element);
}
return true;
}
+ " xmlns=\"" + metaproxy_ns + "\">"
+ ", not " + got_element);
}
return true;
}
-std::string mp_xml::get_route(const xmlNode *node)
+std::string mp_xml::get_route(const xmlNode *node, std::string &auth)
{
std::string route_value;
if (node)
{
std::string route_value;
if (node)
@@
-153,12
+159,14
@@
std::string mp_xml::get_route(const xmlNode *node)
{
std::string name = std::string((const char *) attr->name);
std::string value;
{
std::string name = std::string((const char *) attr->name);
std::string value;
-
+
if (attr->children && attr->children->type == XML_TEXT_NODE)
value = std::string((const char *)attr->children->content);
if (attr->children && attr->children->type == XML_TEXT_NODE)
value = std::string((const char *)attr->children->content);
-
+
if (name == "route")
route_value = value;
if (name == "route")
route_value = value;
+ else if (name == "auth")
+ auth = value;
else
throw XMLError("Only attribute route allowed"
" in " + std::string((const char *)node->name)
else
throw XMLError("Only attribute route allowed"
" in " + std::string((const char *)node->name)
@@
-168,6
+176,11
@@
std::string mp_xml::get_route(const xmlNode *node)
return route_value;
}
return route_value;
}
+std::string mp_xml::get_route(const xmlNode *node)
+{
+ std::string auth;
+ return get_route(node, auth);
+}
const xmlNode* mp_xml::jump_to_children(const xmlNode* node,
int xml_node_type)
const xmlNode* mp_xml::jump_to_children(const xmlNode* node,
int xml_node_type)
@@
-200,10
+213,16
@@
void mp_xml::check_empty(const xmlNode *node)
if (node)
{
const xmlNode *n;
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 "
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);
}
}
}
}