diff options
| author | Dave Beckett <dave@dajobe.org> | 2006-03-18 09:29:50 +0000 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2006-03-18 09:29:50 +0000 |
| commit | 26faf7b12f056c28b961f24fd5371fb7f23f8956 (patch) | |
| tree | c14317b4667f855d1bbebd61d72306d9ce144f4a /src/raptor_rdfxml.c | |
| parent | dd4cc3b9becf2325d4974b222ba14280b355ca5a (diff) | |
| download | raptor-26faf7b12f056c28b961f24fd5371fb7f23f8956.tar.gz | |
Remove generating RAPTOR_IDENTIFIER_TYPE_RESOURCE for statement
predicates as deprecated in 1.4.8
Diffstat (limited to 'src/raptor_rdfxml.c')
| -rw-r--r-- | src/raptor_rdfxml.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/raptor_rdfxml.c b/src/raptor_rdfxml.c index 66052f8d..8c4cd389 100644 --- a/src/raptor_rdfxml.c +++ b/src/raptor_rdfxml.c @@ -1246,12 +1246,6 @@ raptor_rdfxml_generate_statement(raptor_parser *rdf_parser, statement->subject_type=subject_type; statement->predicate=predicate_uri ? (void*)predicate_uri : (void*)predicate_id; - /* FIXME. Deprecated fixup. - * Leave this inplace until dependent code - rasqal and redland - * expect RAPTOR_IDENTIFIER_TYPE_RESOURCE in the predicate position - */ - if(predicate_type == RAPTOR_IDENTIFIER_TYPE_RESOURCE) - predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; statement->predicate_type=predicate_type; statement->object=object_uri ? (void*)object_uri : (void*)object_id; @@ -1312,11 +1306,7 @@ raptor_rdfxml_generate_statement(raptor_parser *rdf_parser, /* generate reified statements */ statement->subject_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; - /* FIXME. Deprecated fixup. - * Leave this inplace until dependent code - rasqal and redland - * expect RAPTOR_IDENTIFIER_TYPE_RESOURCE in the predicate position - */ - statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; + statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; statement->object_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; statement->object_literal_language=NULL; @@ -1329,9 +1319,6 @@ raptor_rdfxml_generate_statement(raptor_parser *rdf_parser, statement->subject_type=reified->type; } - if(predicate_type == RAPTOR_IDENTIFIER_TYPE_PREDICATE) - predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; - statement->predicate=RAPTOR_RDF_type_URI(rdf_xml_parser); statement->object=RAPTOR_RDF_Statement_URI(rdf_xml_parser); (*rdf_parser->statement_handler)(rdf_parser->user_data, statement); @@ -2652,11 +2639,7 @@ raptor_rdfxml_end_element_grammar(raptor_parser *rdf_parser, element->parent->last_ordinal++; } else { predicate_uri=raptor_xml_element_get_name(xml_element)->uri; - /* FIXME. Deprecated fixup. - * Leave this inplace until dependent code - rasqal and redland - * expect RAPTOR_IDENTIFIER_TYPE_RESOURCE in the predicate position - */ - predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; + predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; } |