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
zoom: prepare for using ZOOM_query_sortby2
[metaproxy-moved-to-github.git]
/
src
/
xmlutil.cpp
diff --git
a/src/xmlutil.cpp
b/src/xmlutil.cpp
index
5ea9e84
..
046d803
100644
(file)
--- a/
src/xmlutil.cpp
+++ b/
src/xmlutil.cpp
@@
-1,13
+1,26
@@
-/* $Id: xmlutil.cpp,v 1.12 2007-01-12 10:16:21 adam Exp $
- Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2011 Index Data
- See the LICENSE file for details
- */
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
-#include "xmlutil.hpp"
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
-#include <string.h>
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+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 = metaproxy_1;
// Doxygen doesn't like mp::xml, so we use this instead
@@
-33,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;
@@
-44,7
+60,9
@@
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);
@@
-188,18
+206,25
@@
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);
}
}
/*
* Local variables:
* c-basic-offset: 4
}
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+