summaryrefslogtreecommitdiffstats
path: root/src/libs/serialisation
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-08-16 18:45:27 +0000
committerDavid Robillard <d@drobilla.net>2008-08-16 18:45:27 +0000
commit42936aa5d924ca89fe3d887fd0ffeb7a281b547e (patch)
tree0bc295b9f021bee109822782af4c15504b25efa4 /src/libs/serialisation
parent1116f096282e47c4f85c4681906bacf2516d5a01 (diff)
downloadingen-42936aa5d924ca89fe3d887fd0ffeb7a281b547e.tar.gz
ingen-42936aa5d924ca89fe3d887fd0ffeb7a281b547e.tar.bz2
ingen-42936aa5d924ca89fe3d887fd0ffeb7a281b547e.zip
Add missing Store.cpp.
More serialisation work. git-svn-id: http://svn.drobilla.net/lad/ingen@1402 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/serialisation')
-rw-r--r--src/libs/serialisation/Serialiser.cpp75
-rw-r--r--src/libs/serialisation/Serialiser.hpp14
-rw-r--r--src/libs/serialisation/serialisation.cpp4
-rw-r--r--src/libs/serialisation/serialisation.hpp5
4 files changed, 56 insertions, 42 deletions
diff --git a/src/libs/serialisation/Serialiser.cpp b/src/libs/serialisation/Serialiser.cpp
index 8d5bb1a7..d2f2031f 100644
--- a/src/libs/serialisation/Serialiser.cpp
+++ b/src/libs/serialisation/Serialiser.cpp
@@ -53,8 +53,8 @@ namespace Ingen {
namespace Serialisation {
-Serialiser::Serialiser(Shared::World& world)
- : _store(world.store)
+Serialiser::Serialiser(Shared::World& world, SharedPtr<Shared::Store> store)
+ : _store(store)
, _world(*world.rdf_world)
{
}
@@ -148,22 +148,37 @@ Serialiser::finish()
ret = _model->serialise_to_string();
_base_uri = "";
+#ifdef USE_BLANK_NODES
_node_map.clear();
-
+#endif
return ret;
}
+
+Redland::Node
+Serialiser::patch_path_to_rdf_node(const Path& path)
+{
+#ifdef USE_BLANK_NODES
+ if (path == _root_object->path()) {
+ return Redland::Node(_model->world(), Redland::Node::RESOURCE, _base_uri);
+ } else {
+ assert(path.length() > _root_object->path().length());
+ return Redland::Node(_model->world(), Redland::Node::RESOURCE,
+ _base_uri + string("#") + path.substr(_root_object->path().length()));
+ }
+#else
+ return path_to_rdf_node(path);
+#endif
+}
+
+
/** Convert a path to an RDF blank node ID for serializing.
*/
Redland::Node
-Serialiser::path_to_node_id(const Path& path)
+Serialiser::path_to_rdf_node(const Path& path)
{
- assert(_model);
-
- if (path == _root_object->path())
- return Redland::Node(_model->world(), Redland::Node::RESOURCE, _base_uri);
-
+#if USE_BLANK_NODES
NodeMap::iterator i = _node_map.find(path);
if (i != _node_map.end()) {
assert(i->second);
@@ -175,6 +190,16 @@ Serialiser::path_to_node_id(const Path& path)
_node_map[path] = id;
return id;
}
+#else
+ assert(_model);
+ assert(path.substr(0, _root_object->path().length()) == _root_object->path());
+
+ if (path == _root_object->path())
+ return Redland::Node(_model->world(), Redland::Node::RESOURCE, _base_uri);
+ else
+ return Redland::Node(_model->world(), Redland::Node::RESOURCE,
+ path.substr(_root_object->path().base().length()-1));
+#endif
}
@@ -243,13 +268,13 @@ Serialiser::serialise(SharedPtr<GraphObject> object) throw (std::logic_error)
SharedPtr<Shared::Node> node = PtrCast<Shared::Node>(object);
if (node) {
- serialise_node(node, path_to_node_id(node->path()));
+ serialise_node(node, path_to_rdf_node(node->path()));
return;
}
SharedPtr<Shared::Port> port = PtrCast<Shared::Port>(object);
if (port) {
- serialise_port(port.get(), path_to_node_id(port->path()));
+ serialise_port(port.get(), path_to_rdf_node(port->path()));
return;
}
@@ -258,25 +283,12 @@ Serialiser::serialise(SharedPtr<GraphObject> object) throw (std::logic_error)
}
-Redland::Node
-Serialiser::patch_path_to_rdf_id(const Path& path)
-{
- if (path == _root_object->path()) {
- return Redland::Node(_model->world(), Redland::Node::RESOURCE, _base_uri);
- } else {
- assert(path.length() > _root_object->path().length());
- return Redland::Node(_model->world(), Redland::Node::RESOURCE,
- _base_uri + string("#") + path.substr(_root_object->path().length()));
- }
-}
-
-
void
Serialiser::serialise_patch(SharedPtr<Shared::Patch> patch)
{
assert(_model);
- const Redland::Node patch_id = patch_path_to_rdf_id(patch->path());
+ const Redland::Node patch_id = patch_path_to_rdf_node(patch->path());
_model->add_statement(
patch_id,
@@ -301,7 +313,6 @@ Serialiser::serialise_patch(SharedPtr<Shared::Patch> patch)
serialise_variables(patch_id, patch->variables());
- //for (GraphObject::const_iterator n = patch->children_begin(); n != patch->children_end(); ++n) {
for (GraphObject::const_iterator n = _store->children_begin(patch);
n != _store->children_end(patch); ++n) {
@@ -311,10 +322,10 @@ Serialiser::serialise_patch(SharedPtr<Shared::Patch> patch)
SharedPtr<Shared::Patch> patch = PtrCast<Shared::Patch>(n->second);
SharedPtr<Shared::Node> node = PtrCast<Shared::Node>(n->second);
if (patch) {
- _model->add_statement(patch_id, "ingen:node", patch_path_to_rdf_id(patch->path()));
+ _model->add_statement(patch_id, "ingen:node", patch_path_to_rdf_node(patch->path()));
serialise_patch(patch);
} else if (node) {
- const Redland::Node node_id = path_to_node_id(n->second->path());
+ const Redland::Node node_id = path_to_rdf_node(n->second->path());
_model->add_statement(patch_id, "ingen:node", node_id);
serialise_node(node, node_id);
}
@@ -322,7 +333,7 @@ Serialiser::serialise_patch(SharedPtr<Shared::Patch> patch)
for (uint32_t i=0; i < patch->num_ports(); ++i) {
Port* p = patch->port(i);
- const Redland::Node port_id = path_to_node_id(p->path());
+ const Redland::Node port_id = path_to_rdf_node(p->path());
_model->add_statement(patch_id, "ingen:port", port_id);
serialise_port(p, port_id);
}
@@ -379,7 +390,7 @@ Serialiser::serialise_node(SharedPtr<Shared::Node> node, const Redland::Node& no
for (uint32_t i=0; i < node->num_ports(); ++i) {
Port* p = node->port(i);
assert(p);
- const Redland::Node port_id = path_to_node_id(p->path());
+ const Redland::Node port_id = path_to_rdf_node(p->path());
serialise_port(p, port_id);
_model->add_statement(node_id, "ingen:port", port_id);
}
@@ -422,8 +433,8 @@ Serialiser::serialise_connection(SharedPtr<Connection> connection) throw (std::l
if (!_model)
throw std::logic_error("serialise_connection called without serialization in progress");
- const Redland::Node src_node = path_to_node_id(connection->src_port_path());
- const Redland::Node dst_node = path_to_node_id(connection->dst_port_path());
+ const Redland::Node src_node = path_to_rdf_node(connection->src_port_path());
+ const Redland::Node dst_node = path_to_rdf_node(connection->dst_port_path());
/* This would allow associating data with the connection... */
/*const Redland::Node connection_node = _world.blank_id();
diff --git a/src/libs/serialisation/Serialiser.hpp b/src/libs/serialisation/Serialiser.hpp
index eb3a8810..5810f259 100644
--- a/src/libs/serialisation/Serialiser.hpp
+++ b/src/libs/serialisation/Serialiser.hpp
@@ -56,7 +56,7 @@ namespace Serialisation {
class Serialiser
{
public:
- Serialiser(Shared::World& world);
+ Serialiser(Shared::World& world, SharedPtr<Shared::Store> store);
void to_file(SharedPtr<GraphObject> object, const std::string& filename);
@@ -85,18 +85,20 @@ private:
void serialise_variables(Redland::Node subject, const GraphObject::Variables& variables);
- Redland::Node path_to_node_id(const Path& path);
- Redland::Node patch_path_to_rdf_id(const Path& path);
-
- typedef std::map<Raul::Path, Redland::Node> NodeMap;
+ Redland::Node path_to_rdf_node(const Path& path);
+ Redland::Node patch_path_to_rdf_node(const Path& path);
SharedPtr<GraphObject> _root_object;
SharedPtr<Shared::Store> _store;
Mode _mode;
- NodeMap _node_map;
std::string _base_uri;
Redland::World& _world;
Redland::Model* _model;
+
+#ifdef USE_BLANK_NODES
+ typedef std::map<Raul::Path, Redland::Node> NodeMap;
+ NodeMap _node_map;
+#endif
};
diff --git a/src/libs/serialisation/serialisation.cpp b/src/libs/serialisation/serialisation.cpp
index 49b8d465..3ece3772 100644
--- a/src/libs/serialisation/serialisation.cpp
+++ b/src/libs/serialisation/serialisation.cpp
@@ -33,10 +33,10 @@ new_loader()
Ingen::Serialisation::Serialiser*
-new_serialiser(Ingen::Shared::World* world)
+new_serialiser(Ingen::Shared::World* world, SharedPtr<Store> store)
{
assert(world->rdf_world);
- return new Serialiser(*world);
+ return new Serialiser(*world, store);
}
diff --git a/src/libs/serialisation/serialisation.hpp b/src/libs/serialisation/serialisation.hpp
index 8f6e8291..abae159c 100644
--- a/src/libs/serialisation/serialisation.hpp
+++ b/src/libs/serialisation/serialisation.hpp
@@ -20,7 +20,7 @@
namespace Ingen {
-namespace Shared { class World; }
+namespace Shared { class World; class Store; }
namespace Serialisation {
@@ -31,7 +31,8 @@ class Serialiser;
extern "C" {
extern Loader* new_loader();
- extern Serialiser* new_serialiser(Ingen::Shared::World* world);
+ extern Serialiser* new_serialiser(Ingen::Shared::World* world,
+ SharedPtr<Shared::Store> store);
}