diff options
| author | David Robillard <d@drobilla.net> | 2009-05-28 01:38:34 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-05-28 01:38:34 +0000 |
| commit | 65a6b475d3c4c15a566100265c73022063aa43f3 (patch) | |
| tree | f90a82bd9110165ab947b875d8e199ca239f07e0 /raul | |
| parent | 9a84cd56147621aa257762facfecac46892f154e (diff) | |
| download | raul-65a6b475d3c4c15a566100265c73022063aa43f3.tar.gz raul-65a6b475d3c4c15a566100265c73022063aa43f3.tar.bz2 raul-65a6b475d3c4c15a566100265c73022063aa43f3.zip | |
Fix QNAMEs being serialised as URIs.
Remove vestigial variable stuff.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@2017 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'raul')
| -rw-r--r-- | raul/Atom.hpp | 8 | ||||
| -rw-r--r-- | raul/AtomRDF.hpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/raul/Atom.hpp b/raul/Atom.hpp index de543f6..07b2c30 100644 --- a/raul/Atom.hpp +++ b/raul/Atom.hpp @@ -181,9 +181,9 @@ private: bool _bool_val; char* _string_val; struct { - size_t _blob_type_length; // length of type string (first part of buffer, inc. \0) - size_t _blob_size; // length of data after type string - void* _blob_val; // buffer + size_t _blob_type_length; // length of type string (first part of buffer, inc. \0) + size_t _blob_size; // length of data after type string + void* _blob_val; // buffer }; }; }; @@ -198,7 +198,7 @@ static inline std::ostream& operator<<(std::ostream& os, const Raul::Atom& atom) case Raul::Atom::INT: return os << atom.get_int32(); case Raul::Atom::FLOAT: return os << atom.get_float(); case Raul::Atom::BOOL: return os << atom.get_bool(); - case Raul::Atom::URI: return os << atom.get_uri(); + case Raul::Atom::URI: return os << "<" << atom.get_uri() << ">"; case Raul::Atom::STRING: return os << atom.get_string(); case Raul::Atom::BLOB: return os << atom.get_blob(); } diff --git a/raul/AtomRDF.hpp b/raul/AtomRDF.hpp index 496fcef..2d0ffae 100644 --- a/raul/AtomRDF.hpp +++ b/raul/AtomRDF.hpp @@ -93,7 +93,7 @@ atom_to_node(Redland::World& world, const Atom& atom) break; case Atom::URI: str = atom.get_uri(); - node = librdf_new_node_from_uri_string(world.world(), CUC(str.c_str())); + node = librdf_new_node_from_uri_string(world.world(), CUC(world.expand_uri(str).c_str())); break; case Atom::STRING: str = atom.get_string(); |