Remove locked_sstream dependency.

[libcxml.git] / src / cxml.cc

diff --git a/src/cxml.cc b/src/cxml.cc
index 3248324bb8b8c6e69e0e9d864182e508e4f02145..82e4bc3eca909fe9961dcfe24c6860b73eaaa930 100644 (file)
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -43,7 +43,9 @@ cxml::Node::Node (xmlpp::Node* node)
 string
 cxml::Node::name () const
 {
-       assert (_node);
+       if (!_node) {
+               throw Error ("No node to read name from");
+       }
        return _node->get_name ();
 }
 
@@ -73,6 +75,22 @@ cxml::Node::optional_node_child (string name) const
        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
 {
@@ -207,7 +225,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 ();
                }
        }
@@ -282,3 +300,71 @@ cxml::Document::take_root_node ()
                _root_name = _node->get_name ();
        }
 }
+
+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));
+}