/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libcxml.
*/
+#include "cxml.h"
+#include <libxml++/libxml++.h>
+#include <libxml++config.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
-#include <libxml++/libxml++.h>
-#include "cxml.h"
+#include <cstdio>
+
+using std::make_shared;
+using std::shared_ptr;
using std::string;
-using std::list;
-using boost::shared_ptr;
+using std::vector;
using boost::optional;
+
cxml::Node::Node ()
- : _node (0)
+ : _node (nullptr)
{
}
shared_ptr<cxml::Node>
cxml::Node::node_child (string name) const
{
- list<shared_ptr<cxml::Node> > n = node_children (name);
+ auto const n = node_children (name);
if (n.size() > 1) {
throw cxml::Error ("duplicate XML tag " + name);
} else if (n.empty ()) {
shared_ptr<cxml::Node>
cxml::Node::optional_node_child (string name) const
{
- list<shared_ptr<cxml::Node> > n = node_children (name);
+ auto const n = node_children (name);
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");
}
- xmlpp::Node::NodeList c = _node->get_children ();
- list<shared_ptr<cxml::Node> > n;
- for (xmlpp::Node::NodeList::iterator i = c.begin (); i != c.end(); ++i) {
- n.push_back (shared_ptr<Node> (new Node (*i)));
+ vector<shared_ptr<cxml::Node>> n;
+ for (auto i: _node->get_children()) {
+ 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.
*/
- xmlpp::Node::NodeList c = _node->get_children ();
+ 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);
- list<shared_ptr<cxml::Node> > n;
- for (xmlpp::Node::NodeList::iterator i = c.begin (); i != c.end(); ++i) {
- if ((*i)->get_name() == name) {
- n.push_back (shared_ptr<Node> (new Node (*i)));
+ vector<shared_ptr<cxml::Node>> n;
+ for (auto i: _node->get_children()) {
+ if (i->get_name() == glib_name) {
+ n.push_back(make_shared<Node>(i));
}
}
- _taken.push_back (name);
+ _taken.push_back(glib_name);
return n;
}
optional<string>
cxml::Node::optional_string_child (string c) const
{
- list<shared_ptr<Node> > nodes = node_children (c);
+ auto const nodes = node_children (c);
if (nodes.size() > 1) {
throw cxml::Error ("duplicate XML tag " + c);
}
if (nodes.empty ()) {
- return optional<string> ();
+ return {};
}
return nodes.front()->content();
bool
cxml::Node::bool_child (string c) const
{
- string const s = string_child (c);
+ auto const s = string_child (c);
return (s == "1" || s == "yes" || s == "True");
}
optional<bool>
cxml::Node::optional_bool_child (string c) const
{
- optional<string> s = optional_string_child (c);
+ auto const s = optional_string_child (c);
if (!s) {
- return optional<bool> ();
+ return {};
}
return (s.get() == "1" || s.get() == "yes" || s.get() == "True");
string
cxml::Node::string_attribute (string name) const
{
- xmlpp::Element const * e = dynamic_cast<const xmlpp::Element *> (_node);
+ auto e = dynamic_cast<const xmlpp::Element *> (_node);
if (!e) {
throw cxml::Error ("missing attribute " + name);
}
- xmlpp::Attribute* a = e->get_attribute (name);
+ auto a = e->get_attribute (name);
if (!a) {
throw cxml::Error ("missing attribute " + name);
}
optional<string>
cxml::Node::optional_string_attribute (string name) const
{
- xmlpp::Element const * e = dynamic_cast<const xmlpp::Element *> (_node);
+ auto e = dynamic_cast<const xmlpp::Element *> (_node);
if (!e) {
- return optional<string> ();
+ return {};
}
- xmlpp::Attribute* a = e->get_attribute (name);
+ auto a = e->get_attribute (name);
if (!a) {
- return optional<string> ();
+ return {};
}
return string (a->get_value ());
bool
cxml::Node::bool_attribute (string name) const
{
- string const s = string_attribute (name);
+ auto const s = string_attribute (name);
return (s == "1" || s == "yes");
}
optional<bool>
cxml::Node::optional_bool_attribute (string name) const
{
- optional<string> s = optional_string_attribute (name);
+ auto s = optional_string_attribute (name);
if (!s) {
- return optional<bool> ();
+ return {};
}
return (s.get() == "1" || s.get() == "yes");
void
cxml::Node::done () const
{
- xmlpp::Node::NodeList c = _node->get_children ();
- for (xmlpp::Node::NodeList::iterator i = c.begin(); i != c.end(); ++i) {
- 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());
+ for (auto i: _node->get_children()) {
+ 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());
}
}
}
{
string content;
- 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);
+ for (auto i: _node->get_children()) {
+ auto v = dynamic_cast<xmlpp::ContentNode const *> (i);
if (v && dynamic_cast<xmlpp::TextNode const *>(v)) {
content += v->get_content ();
}
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)
{
}
_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 ();
string
make_local (string v)
{
- struct lconv* lc = localeconv ();
+ auto lc = localeconv ();
boost::algorithm::replace_all (v, ".", lc->decimal_point);
/* We hope it's ok not to add in thousands separators here */
return v;
return y;
}
+template<>
+long unsigned int
+locale_convert (string x)
+{
+ long unsigned int y = 0;
+#ifdef LIBCXML_WINDOWS
+ __mingw_sscanf (x.c_str(), "%lud", &y);
+#else
+ sscanf (x.c_str(), "%lud", &y);
+#endif
+ return y;
+}
+
template<>
long long
locale_convert (string x)
return y;
}
+template<>
+long long unsigned
+locale_convert (string x)
+{
+ long long unsigned y = 0;
+#ifdef LIBCXML_WINDOWS
+ __mingw_sscanf (x.c_str(), "%llud", &y);
+#else
+ sscanf (x.c_str(), "%llud", &y);
+#endif
+ return y;
+}
+
template<>
float
locale_convert (string x)
return locale_convert<int> (make_local(v));
}
+template <>
+unsigned int
+cxml::raw_convert (string v)
+{
+ return locale_convert<unsigned int> (make_local(v));
+}
+
template <>
long int
cxml::raw_convert (string v)
return locale_convert<long int> (make_local(v));
}
+template <>
+long unsigned int
+cxml::raw_convert (string v)
+{
+ return locale_convert<long unsigned int> (make_local(v));
+}
+
template <>
long long
cxml::raw_convert (string v)
}
template <>
-unsigned int
+long long unsigned
cxml::raw_convert (string v)
{
- return locale_convert<unsigned int> (make_local(v));
+ return locale_convert<long long unsigned> (make_local(v));
}
template <>
{
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);
+}
projects / libcxml.git / blobdiff