From f31f6e53c139e194d0d0b4f24b7988c5c3652727 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 18 Aug 2008 19:02:13 +0000 Subject: Fix copy/paste between different patches. Barf less serialisation stuff to the console. git-svn-id: http://svn.drobilla.net/lad/ingen@1431 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/serialisation/Parser.cpp | 6 ------ src/libs/serialisation/Serialiser.cpp | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/libs/serialisation') diff --git a/src/libs/serialisation/Parser.cpp b/src/libs/serialisation/Parser.cpp index 0e83b858..c26921ea 100644 --- a/src/libs/serialisation/Parser.cpp +++ b/src/libs/serialisation/Parser.cpp @@ -228,12 +228,8 @@ Parser::parse_patch( patch_poly = static_cast(poly_node.to_int()); } - cout << "XXXXXXXXXX " << engine_base << endl; - cout << "YYYYYYYYYY " << uri_relative_to_base(base_uri, object_uri) << endl; string symbol = uri_relative_to_base(base_uri, object_uri); symbol = symbol.substr(0, symbol.find(".")); - cout << "SSSSSSSSSS " << symbol << endl; - cout << "BBBBBBBBBBB " << engine_base << endl; Path patch_path("/"); if (engine_base == "") patch_path = "/"; @@ -242,8 +238,6 @@ Parser::parse_patch( else patch_path = (Path)engine_base; - cout << "!!!!!!!!!!!!!!!!!!! PATCH PATH: " << patch_path << endl; - if (patch_path != engine_base && patch_path != "/") target->new_patch(patch_path, patch_poly); diff --git a/src/libs/serialisation/Serialiser.cpp b/src/libs/serialisation/Serialiser.cpp index dd431f12..5f4c0cbf 100644 --- a/src/libs/serialisation/Serialiser.cpp +++ b/src/libs/serialisation/Serialiser.cpp @@ -77,7 +77,6 @@ Serialiser::to_string(SharedPtr object, const string& base_uri, const GraphObject::Variables& extra_rdf) { - _root_path = object->path(); start_to_string(object->path(), base_uri); serialise(object); @@ -121,12 +120,16 @@ Serialiser::start_to_filename(const string& filename) * * The results of the serialization will be returned by the finish() method after * the desired objects have been serialised. + * + * All serialized paths will have the root path chopped from their prefix + * (therefore all serialized paths must be descendants of the root) */ void Serialiser::start_to_string(const Raul::Path& root, const string& base_uri) { setlocale(LC_NUMERIC, "C"); + _root_path = root; _base_uri = base_uri; _model = new Redland::Model(_world); _model->set_base_uri(base_uri); -- cgit v1.2.1