diff options
Diffstat (limited to 'src/libs/serialisation')
| -rw-r--r-- | src/libs/serialisation/Parser.cpp | 6 | ||||
| -rw-r--r-- | src/libs/serialisation/Serialiser.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
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<uint32_t>(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<GraphObject> 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); |