Changeset 2110

Timestamp:

06/14/09 16:42:17 (15 months ago)

Author:

drobilla

Message:

Parse dynamic manifest with correct base URI.

Location:

trunk/slv2/src

Files:

• plugin.c (modified) (1 diff)
• world.c (modified) (2 diffs)

trunk/slv2/src/plugin.c

@@ -247 +247 @@
                         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);
                 }

trunk/slv2/src/world.c

@@ -256 +256 @@
                 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);
 
@@ -275 +275 @@
                                         (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