From f441fcf624d90ad1bff390b3c9d096e27a298573 Mon Sep 17 00:00:00 2001 From: Dave Beckett Date: Wed, 4 Aug 2010 22:28:47 -0700 Subject: Move generate ID code from raptor_parser to raptor_world class (raptor_world_generate_bnodeid): Replaces raptor_parser_internal_generate_id with arg RAPTOR_GENID_TYPE_BNODEID. Enum raptor_genid_type deleted - only RAPTOR_GENID_TYPE_BNODEID was ever used. raptor_generate_bnodeid_handler handler typedef renamed from raptor_generate_id_handler since it now just applies to blank node IDs. raptor_generate_bnodeid_handler handler renamed from raptor_generate_id_handler. (raptor_free_world): Free user genid prefix if set. (raptor_world_set_generate_bnodeid_handler): Renamed from raptor_parser_set_generate_id_handler. (raptor_world_generate_bnodeid): Renamed from raptor_parser_get_new_generated_id and loses type arg. (raptor_world_set_generate_bnodeid_parameters): Renamed from raptor_parser_set_default_generate_id_parameters. Update all callers to mostly use raptor_world_generate_bnodeid() except where a user bnode ID is given, such as in Turtle _:foo or RDF/XML rdf:nodeid="foo". Remove copying of genid fields from parsers to parsers when creating sub-parsers for e.g. grddl. typedef raptor_parser loses generate_id* and default_generate_id* fields. (raptor_world_internal_generate_id): Renamed from raptor_parser_internal_generate_id and loses type arg. typedef raptor_world gains generate_bnodeid and default_generate_bnodeid fields. (raptor_free_parser): Lose tidying user genid prefix. (raptor_parser_copy_user_state): Remoe copying of genid fields between parser user states. (raptor_parser_get_current_base_id): Deleted, no longer needed to support copying genids between parser states. --- src/raptor_rss.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/raptor_rss.c') diff --git a/src/raptor_rss.c b/src/raptor_rss.c index 9eb8ff3e..9a6faeaa 100644 --- a/src/raptor_rss.c +++ b/src/raptor_rss.c @@ -532,8 +532,7 @@ raptor_rss_start_element_handler(void *user_data, RAPTOR_DEBUG3("FOUND new block type %d - %s\n", block_type, raptor_rss_items_info[block_type].name); update_item = raptor_rss_get_current_item(rss_parser); - id = raptor_parser_internal_generate_id(rdf_parser, - RAPTOR_GENID_TYPE_BNODEID, NULL); + id = raptor_world_generate_bnodeid(rdf_parser->world); block = raptor_new_rss_block(rdf_parser->world, block_type, id); raptor_rss_item_add_block(update_item, block); rss_parser->current_block = block; @@ -1032,9 +1031,7 @@ raptor_rss_insert_identifiers(raptor_parser* rdf_parser) const unsigned char *id; /* need to make bnode */ - id = raptor_parser_internal_generate_id(rdf_parser, - RAPTOR_GENID_TYPE_BNODEID, - NULL); + id = raptor_world_generate_bnodeid(rdf_parser->world); item->term = raptor_new_term_from_blank(rdf_parser->world, id); RAPTOR_FREE(cstring, id); } @@ -1087,9 +1084,7 @@ raptor_rss_insert_identifiers(raptor_parser* rdf_parser) if(!block->identifier) { const unsigned char *id; /* need to make bnode */ - id = raptor_parser_internal_generate_id(rdf_parser, - RAPTOR_GENID_TYPE_BNODEID, - NULL); + id = raptor_world_generate_bnodeid(rdf_parser->world); item->term = raptor_new_term_from_blank(rdf_parser->world, id); RAPTOR_FREE(cstring, id); } @@ -1400,9 +1395,7 @@ raptor_rss_emit(raptor_parser* rdf_parser) const unsigned char* id; raptor_term *items; - id = raptor_parser_internal_generate_id(rdf_parser, - RAPTOR_GENID_TYPE_BNODEID, - NULL); + id = raptor_world_generate_bnodeid(rdf_parser->world); /* make a new genid for the node */ items = raptor_new_term_from_blank(rdf_parser->world, id); -- cgit v1.2.1