diff options
| author | David Robillard <d@drobilla.net> | 2007-07-26 23:39:01 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-26 23:39:01 +0000 |
| commit | f36e709b68144191d51959d6a2224cd9c3ad7871 (patch) | |
| tree | 19f6f9ad4dd573d90224c56052c7bacfc1f76f08 /src/libs/serialisation/Loader.cpp | |
| parent | 23d74f838521320dc1682426341d1874061337a6 (diff) | |
| download | ingen-f36e709b68144191d51959d6a2224cd9c3ad7871.tar.gz ingen-f36e709b68144191d51959d6a2224cd9c3ad7871.tar.bz2 ingen-f36e709b68144191d51959d6a2224cd9c3ad7871.zip | |
Fix recursive patch serialization (fix ticket 63).
git-svn-id: http://svn.drobilla.net/lad/ingen@642 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/serialisation/Loader.cpp')
| -rw-r--r-- | src/libs/serialisation/Loader.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp index 806dbfc3..ac7141cd 100644 --- a/src/libs/serialisation/Loader.cpp +++ b/src/libs/serialisation/Loader.cpp @@ -55,8 +55,10 @@ Loader::load(SharedPtr<EngineInterface> engine, RDF::Model model(*rdf_world, document_uri); - //patch_uri = string("<") + patch_uri + ">"; - patch_uri = string("<") + document_uri + ">"; + if (patch_uri == "") + patch_uri = string("<") + document_uri + ">"; + else + patch_uri = string("<") + patch_uri + ">"; cerr << "[Loader] Loading " << patch_uri << " from " << document_uri << " under " << (string)(parent ? (string)parent.get() : "no parent") << endl; @@ -154,12 +156,12 @@ Loader::load(SharedPtr<EngineInterface> engine, const Path subpatch_path = patch_path.base() + (string)name; if (created.find(subpatch_path) == created.end()) { - load(engine, rdf_world, document_uri, patch_path, name, patch); created[subpatch_path] = true; + load(engine, rdf_world, document_uri, patch_path, name, patch); } } - created.clear(); + //created.clear(); /* Set node port control values */ |