Partially working copy/paste.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2996 a436a847-0d15-0410-975c-d299462d15a1

2 files changed, 4 insertions, 9 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;
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index 0629a97c..7da2048c 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -252,11 +252,7 @@ Serialiser::finish()
 	if (_mode == TO_FILE) {
 		_model->write_to_file(_base_uri, "turtle");
 	} else {
-		char* c_str = _model->write_to_string("turtle");
-		if (c_str != NULL) {
-			ret = c_str;
-			free(c_str);
-		}
+		ret = _model->write_to_string("turtle");
 	}
 
 	delete _model;