projects
/
metaproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7dcf766
)
get_{bool,int} reads childen node
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 8 Jun 2011 14:29:36 +0000
(16:29 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 8 Jun 2011 14:29:36 +0000
(16:29 +0200)
src/xmlutil.cpp
patch
|
blob
|
history
diff --git
a/src/xmlutil.cpp
b/src/xmlutil.cpp
index
7e3db5a
..
288096f
100644
(file)
--- a/
src/xmlutil.cpp
+++ b/
src/xmlutil.cpp
@@
-45,9
+45,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;
@@
-56,7
+59,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);