summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-04-12 01:10:42 +0000
committerDavid Robillard <d@drobilla.net>2012-04-12 01:10:42 +0000
commit6b3ed4bc47e9a6f520a3bd3c793ab20ce21ac91d (patch)
tree88e189d2b51553e993924e1f84e40366b7e252ec /src
parent6b6e3e31386b52bed8fbae531d72ea546b005d7e (diff)
downloadlilv-6b3ed4bc47e9a6f520a3bd3c793ab20ce21ac91d.tar.gz
lilv-6b3ed4bc47e9a6f520a3bd3c793ab20ce21ac91d.tar.bz2
lilv-6b3ed4bc47e9a6f520a3bd3c793ab20ce21ac91d.zip
Fix errors caused by blank node merging.
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@4171 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/plugin.c6
-rw-r--r--src/world.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/plugin.c b/src/plugin.c
index fb181c8..013cbe0 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -166,8 +166,10 @@ lilv_plugin_load(LilvPlugin* p)
get_data_func(p->dynmanifest->handle, fd,
lilv_node_as_string(p->plugin_uri));
rewind(fd);
- serd_reader_read_file_handle(reader, fd,
- (const uint8_t*)"(dyn-manifest)");
+ serd_reader_add_blank_prefix(
+ reader, lilv_world_blank_node_prefix(p->world));
+ serd_reader_read_file_handle(
+ reader, fd, (const uint8_t*)"(dyn-manifest)");
fclose(fd);
}
}
diff --git a/src/world.c b/src/world.c
index db1eaf8..97901e6 100644
--- a/src/world.c
+++ b/src/world.c
@@ -458,6 +458,8 @@ lilv_world_load_dyn_manifest(LilvWorld* world,
SerdEnv* env = serd_env_new(base);
SerdReader* reader = sord_new_reader(
world->model, env, SERD_TURTLE, sord_node_copy(dmanifest));
+ serd_reader_add_blank_prefix(reader,
+ lilv_world_blank_node_prefix(p->world));
serd_reader_read_file_handle(reader, fd,
(const uint8_t*)"(dyn-manifest)");
serd_reader_free(reader);
@@ -768,6 +770,8 @@ lilv_world_load_resource(LilvWorld* world,
SerdEnv* env = serd_env_new(base);
SerdReader* reader = sord_new_reader(
world->model, env, SERD_TURTLE, (SordNode*)file);
+ serd_reader_add_blank_prefix(
+ reader, lilv_world_blank_node_prefix(world));
if (!serd_reader_read_file(reader, str)) {
++n_read;
zix_tree_insert(