summaryrefslogtreecommitdiffstats
path: root/src/serialisation/Parser.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-19 07:57:24 +0000
committerDavid Robillard <d@drobilla.net>2011-02-19 07:57:24 +0000
commitdfb414f7e636892d79aba9fe1f92f463d4c2b0f7 (patch)
treea9dcda585945ec0c624486c6f28f96eb31dfcb4b /src/serialisation/Parser.cpp
parentdb6f76316b6ec7c9ab32f7efd5dce81a976cba82 (diff)
downloadingen-dfb414f7e636892d79aba9fe1f92f463d4c2b0f7.tar.gz
ingen-dfb414f7e636892d79aba9fe1f92f463d4c2b0f7.tar.bz2
ingen-dfb414f7e636892d79aba9fe1f92f463d4c2b0f7.zip
Partially working copy/paste.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2996 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/serialisation/Parser.cpp')
-rw-r--r--src/serialisation/Parser.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index cc9312a3..4d561721 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -238,8 +238,6 @@ Parser::parse(Ingen::Shared::World* world,
subject = model.base_uri();
} else if (data_path) {
subject = Sord::URI(*world->rdf_world(), data_path->chop_start("/"));
- } else {
- subject = nil;
}
Raul::Path path("/");
@@ -275,7 +273,9 @@ Parser::parse(Ingen::Shared::World* world,
if (types.find(patch_class) != types.end()) {
ret = parse_patch(world, target, model, subject, parent, symbol, data);
} else if (types.find(node_class) != types.end()) {
- ret = parse_node(world, target, model, subject, path, data);
+ ret = parse_node(world, target, model,
+ subject, path.child(subject.to_string()),
+ data);
} else if (types.find(port_class) != types.end()) {
parse_properties(world, target, model, subject, path, data);
ret = path;
@@ -461,7 +461,6 @@ Parser::parse_patch(Ingen::Shared::World* world,
target->put(i->second.first, i->second.second);
}
- //parse_properties(world, target, model, subject_node, patch_path, data);
parse_connections(world, target, model, subject_node, patch_path);
return patch_path;