Some platforms don't include libxml++config.h automatically.

[libcxml.git] / src / cxml.cc

diff --git a/src/cxml.cc b/src/cxml.cc
index 356e1df5546908711ca4245c3825c16007aeaf83..d4eb1388499a284f6333faec165def73e7b977b6 100644 (file)
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -20,17 +20,21 @@
 
 #include "cxml.h"
 #include <libxml++/libxml++.h>
+#include <libxml++config.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <cstdio>
 
-using std::string;
-using std::list;
+
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
 
+
 cxml::Node::Node ()
-       : _node (0)
+       : _node (nullptr)
 {
 
 }
@@ -70,42 +74,48 @@ cxml::Node::optional_node_child (string name) const
        if (n.size() > 1) {
                throw cxml::Error ("duplicate XML tag " + name);
        } else if (n.empty ()) {
-               return shared_ptr<cxml::Node> ();
+               return {};
        }
 
        return n.front ();
 }
 
-list<shared_ptr<cxml::Node>>
+vector<shared_ptr<cxml::Node>>
 cxml::Node::node_children () const
 {
        if (!_node) {
                throw Error ("No node to read children from");
        }
 
-       list<shared_ptr<cxml::Node> > n;
+       vector<shared_ptr<cxml::Node>> n;
        for (auto i: _node->get_children()) {
-               n.push_back (shared_ptr<Node> (new Node (i)));
+               n.push_back(make_shared<Node>(i));
        }
 
        return n;
 }
 
-list<shared_ptr<cxml::Node>>
+vector<shared_ptr<cxml::Node>>
 cxml::Node::node_children (string name) const
 {
        /* XXX: using find / get_path should work here, but I can't follow
           how get_path works.
        */
 
-       list<shared_ptr<cxml::Node> > n;
+       if (!_node) {
+               throw cxml::Error("Node has no internal xmlpp node; did you forget to call a read method on cxml::Document?");
+       }
+
+       auto const glib_name = Glib::ustring(name);
+
+       vector<shared_ptr<cxml::Node>> n;
        for (auto i: _node->get_children()) {
-               if (i->get_name() == name) {
-                       n.push_back (shared_ptr<Node> (new Node (i)));
+               if (i->get_name() == glib_name) {
+                       n.push_back(make_shared<Node>(i));
                }
        }
 
-       _taken.push_back (name);
+       _taken.push_back(glib_name);
        return n;
 }
 
@@ -124,7 +134,7 @@ cxml::Node::optional_string_child (string c) const
        }
 
        if (nodes.empty ()) {
-               return optional<string> ();
+               return {};
        }
 
        return nodes.front()->content();
@@ -142,7 +152,7 @@ cxml::Node::optional_bool_child (string c) const
 {
        auto const s = optional_string_child (c);
        if (!s) {
-               return optional<bool> ();
+               return {};
        }
 
        return (s.get() == "1" || s.get() == "yes" || s.get() == "True");
@@ -175,12 +185,12 @@ cxml::Node::optional_string_attribute (string name) const
 {
        auto e = dynamic_cast<const xmlpp::Element *> (_node);
        if (!e) {
-               return optional<string> ();
+               return {};
        }
 
        auto a = e->get_attribute (name);
        if (!a) {
-               return optional<string> ();
+               return {};
        }
 
        return string (a->get_value ());
@@ -198,7 +208,7 @@ cxml::Node::optional_bool_attribute (string name) const
 {
        auto s = optional_string_attribute (name);
        if (!s) {
-               return optional<bool> ();
+               return {};
        }
 
        return (s.get() == "1" || s.get() == "yes");
@@ -208,7 +218,7 @@ void
 cxml::Node::done () const
 {
        for (auto i: _node->get_children()) {
-               if (dynamic_cast<xmlpp::Element *> (i) && find (_taken.begin(), _taken.end(), i->get_name()) == _taken.end ()) {
+               if (dynamic_cast<xmlpp::Element*>(i) && find(_taken.begin(), _taken.end(), i->get_name()) == _taken.end()) {
                        throw cxml::Error ("unexpected XML node " + i->get_name());
                }
        }
@@ -241,6 +251,13 @@ cxml::Node::namespace_prefix () const
        return _node->get_namespace_prefix ();
 }
 
+
+bool
+cxml::Node::is_text() const
+{
+       return dynamic_cast<const xmlpp::TextNode*>(_node);
+}
+
 cxml::Document::Document (string root_name)
        : _root_name (root_name)
 {
@@ -290,7 +307,7 @@ cxml::Document::take_root_node ()
        }
 
        _node = _parser->get_document()->get_root_node ();
-       if (!_root_name.empty() && _node->get_name() != _root_name) {
+       if (!_root_name.empty() && _node->get_name() != Glib::ustring(_root_name)) {
                throw cxml::Error ("unrecognised root node " + _node->get_name() + " (expecting " + _root_name + ")");
        } else if (_root_name.empty ()) {
                _root_name = _node->get_name ();
@@ -456,3 +473,21 @@ cxml::raw_convert (string v)
 {
        return locale_convert<double> (make_local(v));
 }
+
+
+xmlpp::Element*
+cxml::add_child(xmlpp::Element* parent, string const& name, string const& ns_prefix)
+{
+#if LIBXMLXX_MAJOR_VERSION == 2
+       return parent->add_child(name, ns_prefix);
+#else
+       return parent->add_child_element(name, ns_prefix);
+#endif
+}
+
+
+void
+cxml::add_text_child(xmlpp::Element* parent, string const& name, string const& text)
+{
+       add_child(parent, name)->add_child_text(text);
+}