diff options
| author | David Robillard <d@drobilla.net> | 2009-06-14 23:42:17 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-06-14 23:42:17 +0000 |
| commit | dcd7a652424b16868763820ca630750c5b2e011f (patch) | |
| tree | 754e08ca7b62ea6d6808ac876393136d2727c827 /src | |
| parent | 39dfb4d149d36224e91685bbca950e709d5e3e99 (diff) | |
| download | lilv-dcd7a652424b16868763820ca630750c5b2e011f.tar.gz lilv-dcd7a652424b16868763820ca630750c5b2e011f.tar.bz2 lilv-dcd7a652424b16868763820ca630750c5b2e011f.zip | |
Parse dynamic manifest with correct base URI.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2110 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugin.c | 2 | ||||
| -rw-r--r-- | src/world.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/plugin.c b/src/plugin.c index 43b3f78..c384801 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -246,7 +246,7 @@ slv2_plugin_load(SLV2Plugin p) get_data_func(handle, fd, slv2_value_as_string(p->plugin_uri)); rewind(fd); librdf_parser_parse_file_handle_into_model(p->world->parser, - fd, 0, slv2_value_as_librdf_uri(p->plugin_uri), p->rdf); + fd, 0, slv2_value_as_librdf_uri(p->bundle_uri), p->rdf); fclose(fd); } diff --git a/src/world.c b/src/world.c index 4d004d9..1844666 100644 --- a/src/world.c +++ b/src/world.c @@ -255,7 +255,7 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri) get_subjects_func(handle, fd); rewind(fd); librdf_parser_parse_file_handle_into_model(world->parser, - fd, 0, librdf_node_get_uri(binary_node), dyn_manifest_model); + fd, 0, bundle_uri->val.uri_val, dyn_manifest_model); fclose(fd); // Query plugins from dynamic manifest @@ -274,15 +274,11 @@ slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri) librdf_node* predicate = librdf_new_node_from_uri_string(world->world, (const unsigned char*)(SLV2_NS_RDFS "seeAlso")); librdf_node* object = librdf_new_node_from_node(binary_node); - librdf_model_add(dyn_manifest_model, plugin, predicate, object); + librdf_model_add(manifest_model, plugin, predicate, object); } librdf_free_query_results(r); librdf_free_query(dyn_query); - /*printf("*************************************************\n"); - librdf_model_print(dyn_manifest_model, stdout); - printf("*************************************************\n");*/ - // Merge dynamic model into main manifest model librdf_stream* dyn_manifest_stream = librdf_model_as_stream(dyn_manifest_model); librdf_model_add_statements(manifest_model, dyn_manifest_stream); |