diff options
| author | Dave Beckett <dave@dajobe.org> | 2005-09-18 17:22:06 +0000 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2005-09-18 17:22:06 +0000 |
| commit | 431dbcfc4e66e4e97807f62a0c83521a28b18baf (patch) | |
| tree | 64e6a7ec72ed87e4360b7b479354f86e828f7211 /src | |
| parent | 55eaa89dfdd28e8f82889f06ab6492145b1b9574 (diff) | |
| download | raptor-431dbcfc4e66e4e97807f62a0c83521a28b18baf.tar.gz | |
Replace all RAPTOR_IDENTIFIER_TYPE_PREDICATE with
RAPTOR_IDENTIFIER_TYPE_RESOURCE
Diffstat (limited to 'src')
| -rw-r--r-- | src/n3_parser.y | 2 | ||||
| -rw-r--r-- | src/ntriples_parse.c | 2 | ||||
| -rw-r--r-- | src/raptor_rdfxml.c | 28 | ||||
| -rw-r--r-- | src/turtle_parser.y | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/n3_parser.y b/src/n3_parser.y index 96d65b29..2505d854 100644 --- a/src/n3_parser.y +++ b/src/n3_parser.y @@ -1031,7 +1031,7 @@ raptor_n3_generate_statement(raptor_parser *parser, raptor_triple *t) } if(!predicate_ordinal) { - statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; + statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; statement->predicate=t->predicate->uri; } diff --git a/src/ntriples_parse.c b/src/ntriples_parse.c index 8bb5c53f..832ef0f4 100644 --- a/src/ntriples_parse.c +++ b/src/ntriples_parse.c @@ -189,7 +189,7 @@ raptor_ntriples_generate_statement(raptor_parser* parser, if(!predicate_ordinal) { predicate_uri=raptor_new_uri_relative_to_base(parser->base_uri, predicate); - statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; + statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; statement->predicate=predicate_uri; } diff --git a/src/raptor_rdfxml.c b/src/raptor_rdfxml.c index 36370dc9..dbf2b484 100644 --- a/src/raptor_rdfxml.c +++ b/src/raptor_rdfxml.c @@ -1468,7 +1468,7 @@ raptor_generate_statement(raptor_parser *rdf_parser, /* generate reified statements */ statement->subject_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; - 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; @@ -1656,7 +1656,7 @@ raptor_process_property_attributes(raptor_parser *rdf_parser, attr->uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_ATTRIBUTE, (raptor_uri*)value, @@ -1715,7 +1715,7 @@ raptor_process_property_attributes(raptor_parser *rdf_parser, property_uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_ATTRIBUTE, object_uri, @@ -1980,7 +1980,7 @@ raptor_start_element_grammar(raptor_parser *rdf_parser, RAPTOR_RDF_type_URI(rdf_xml_parser), NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, RAPTOR_RDF_Bag_URI(rdf_xml_parser), @@ -2024,7 +2024,7 @@ raptor_start_element_grammar(raptor_parser *rdf_parser, RAPTOR_RDF_type_URI(rdf_xml_parser), NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, collection_uri, @@ -2047,7 +2047,7 @@ raptor_start_element_grammar(raptor_parser *rdf_parser, collection_uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, element->subject.uri, @@ -2095,7 +2095,7 @@ raptor_start_element_grammar(raptor_parser *rdf_parser, collection_uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, NULL, @@ -2145,7 +2145,7 @@ raptor_start_element_grammar(raptor_parser *rdf_parser, RAPTOR_RDF_type_URI(rdf_xml_parser), NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, raptor_xml_element_get_name(xml_element)->uri, @@ -2517,7 +2517,7 @@ raptor_end_element_grammar(raptor_parser *rdf_parser, raptor_xml_element_get_name(element->parent->sax2)->uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_ELEMENT, element->subject.uri, @@ -2563,7 +2563,7 @@ raptor_end_element_grammar(raptor_parser *rdf_parser, raptor_xml_element_get_name(xml_element)->uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_ELEMENT, element->subject.uri, @@ -2640,7 +2640,7 @@ raptor_end_element_grammar(raptor_parser *rdf_parser, rest_uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, nil_uri, @@ -2737,7 +2737,7 @@ raptor_end_element_grammar(raptor_parser *rdf_parser, RAPTOR_RDF_type_URI(rdf_xml_parser), NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_URI, RAPTOR_RDF_Bag_URI(rdf_xml_parser), @@ -2795,7 +2795,7 @@ raptor_end_element_grammar(raptor_parser *rdf_parser, element->parent->last_ordinal++; } else { predicate_uri=raptor_xml_element_get_name(xml_element)->uri; - predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; + predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; } @@ -2904,7 +2904,7 @@ raptor_end_element_grammar(raptor_parser *rdf_parser, raptor_xml_element_get_name(xml_element)->uri, NULL, - RAPTOR_IDENTIFIER_TYPE_PREDICATE, + RAPTOR_IDENTIFIER_TYPE_RESOURCE, RAPTOR_URI_SOURCE_ELEMENT, (raptor_uri*)buffer, diff --git a/src/turtle_parser.y b/src/turtle_parser.y index 4b2aaa9a..086b13f6 100644 --- a/src/turtle_parser.y +++ b/src/turtle_parser.y @@ -1032,7 +1032,7 @@ raptor_turtle_generate_statement(raptor_parser *parser, raptor_triple *t) } if(!predicate_ordinal) { - statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_PREDICATE; + statement->predicate_type=RAPTOR_IDENTIFIER_TYPE_RESOURCE; statement->predicate=t->predicate->uri; } |