Make Node::content ignore comments and CDATA.

diff --git a/src/cxml.cc b/src/cxml.cc
index 77770f93b0fb7ad943de5863cc72a151d79db518..3c2eda203bbf96f4aac476a8224e099885d69462 100644 (file)
--- 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);
         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 ();
                }
        }
                        content += v->get_content ();
                }
        }

diff --git a/src/cxml.h b/src/cxml.h
index b7f1ef578a9093c3cb4b21e5bc3d557ca50d744e..4d01eefdd8858a6985f25451455e210214d24c83 100644 (file)
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -188,7 +188,7 @@ public:
                return n;
        }
 
                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 */
        std::string content () const;
 
        /** @return namespace URI of this node */

diff --git a/test/ref/a.xml b/test/ref/a.xml
index e854aae06b40f842cf6aaf76e4e4fd28f9aba504..fa8901f8d86d36d8e26a77a462fce154eb33678a 100644 (file)
--- a/test/ref/a.xml
+++ b/test/ref/a.xml
@@ -5,6 +5,6 @@
   <E>yes</E>
   <F>1</F>
   <F>2</F>
   <E>yes</E>
   <F>1</F>
   <F>2</F>

-  <H><I>testing</I><I>more testing</I></H>
+  <H><I>testing</I><I><!-- ignore this -->more testing</I></H>

   <J><K>jim</K></J>
 </A>
   <J><K>jim</K></J>
 </A>