summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-04-22 21:52:32 +0100
committerCarl Hetherington <cth@carlh.net>2018-04-22 21:52:32 +0100
commita45e4307d377da9fbd17890a3701b443eef5b94e (patch)
tree19812b86522bb5d510dc6ecb6247f95bba5c480e /src
parentabec1be888ad42013e3e45d22984420fd26892f3 (diff)
Make Node::content ignore comments and CDATA.
Diffstat (limited to 'src')
-rw-r--r--src/cxml.cc2
-rw-r--r--src/cxml.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cxml.cc b/src/cxml.cc
index 77770f9..3c2eda2 100644
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -220,7 +220,7 @@ cxml::Node::content () const
xmlpp::Node::NodeList c = _node->get_children ();
for (xmlpp::Node::NodeList::const_iterator i = c.begin(); i != c.end(); ++i) {
xmlpp::ContentNode const * v = dynamic_cast<xmlpp::ContentNode const *> (*i);
- if (v) {
+ if (v && dynamic_cast<xmlpp::TextNode const *>(v)) {
content += v->get_content ();
}
}
diff --git a/src/cxml.h b/src/cxml.h
index b7f1ef5..4d01eef 100644
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -188,7 +188,7 @@ public:
return n;
}
- /** @return The content of this node */
+ /** @return The text content of this node (including comments or CDATA) */
std::string content () const;
/** @return namespace URI of this node */