/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of libcxml.
+
+ libcxml is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ libcxml is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with libcxml. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <sstream>
-#include <iostream>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include <libxml++/libxml++.h>
#include "cxml.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using boost::shared_ptr;
+using boost::optional;
cxml::Node::Node ()
: _node (0)
string
cxml::Node::name () const
{
- assert (_node);
+ if (!_node) {
+ throw Error ("No node to read name from");
+ }
return _node->get_name ();
}
} else if (n.empty ()) {
throw cxml::Error ("missing XML tag " + name + " in " + _node->get_name());
}
-
+
return n.front ();
}
} else if (n.empty ()) {
return shared_ptr<cxml::Node> ();
}
-
+
return n.front ();
}
+list<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)));
+ }
+
+ return n;
+}
+
list<shared_ptr<cxml::Node> >
cxml::Node::node_children (string name) const
{
*/
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) {
if ((*i)->get_name() == name) {
n.push_back (shared_ptr<Node> (new Node (*i)));
}
}
-
+
_taken.push_back (name);
return n;
}
cxml::Node::bool_child (string c) const
{
string const s = string_child (c);
- return (s == "1" || s == "yes");
+ return (s == "1" || s == "yes" || s == "True");
}
optional<bool>
if (!s) {
return optional<bool> ();
}
-
- return (s.get() == "1" || s.get() == "yes");
+
+ return (s.get() == "1" || s.get() == "yes" || s.get() == "True");
}
void
if (!e) {
throw cxml::Error ("missing attribute " + name);
}
-
+
xmlpp::Attribute* a = e->get_attribute (name);
if (!a) {
throw cxml::Error ("missing attribute " + name);
if (!e) {
return optional<string> ();
}
-
+
xmlpp::Attribute* a = e->get_attribute (name);
if (!a) {
return optional<string> ();
cxml::Node::content () const
{
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);
- if (v) {
+ if (v && dynamic_cast<xmlpp::TextNode const *>(v)) {
content += v->get_content ();
}
}
}
void
-cxml::Document::read_file (filesystem::path file)
+cxml::Document::read_file (boost::filesystem::path file)
{
- if (!filesystem::exists (file)) {
+ if (!boost::filesystem::exists (file)) {
throw cxml::Error ("XML file " + file.string() + " does not exist");
}
-
- _parser->parse_file (file.string ());
- take_root_node ();
-}
-void
-cxml::Document::read_stream (istream& stream)
-{
- _parser->parse_stream (stream);
+ _parser->parse_file (file.string ());
take_root_node ();
}
void
cxml::Document::read_string (string s)
{
- stringstream t (s);
- _parser->parse_stream (t);
+ _parser->parse_memory (s);
take_root_node ();
}
}
}
+static
+string
+make_local (string v)
+{
+ struct lconv* lc = localeconv ();
+ boost::algorithm::replace_all (v, ".", lc->decimal_point);
+ /* We hope it's ok not to add in thousands separators here */
+ return v;
+}
+
+template <typename P, typename Q>
+P
+locale_convert (Q x)
+{
+ /* We can't write a generic version of locale_convert; all required
+ versions must be specialised.
+ */
+ BOOST_STATIC_ASSERT (sizeof(Q) == 0);
+}
+
+template<>
+int
+locale_convert (string x)
+{
+ int y = 0;
+ sscanf (x.c_str(), "%d", &y);
+ return y;
+}
+
+template<>
+float
+locale_convert (string x)
+{
+ float y = 0;
+ sscanf (x.c_str(), "%f", &y);
+ return y;
+}
+
+template <>
+double
+locale_convert (string x)
+{
+ double y = 0;
+ sscanf (x.c_str(), "%lf", &y);
+ return y;
+}
+
+template <>
+int
+cxml::raw_convert (string v)
+{
+ return locale_convert<int> (make_local(v));
+}
+
+template <>
+float
+cxml::raw_convert (string v)
+{
+ return locale_convert<float> (make_local(v));
+}
+
+template <>
+double
+cxml::raw_convert (string v)
+{
+ return locale_convert<double> (make_local(v));
+}
projects / libcxml.git / blobdiff