jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/382445 )
Change subject: Fix writing normalized property predicates ...................................................................... Fix writing normalized property predicates This includes two changes: 1. For quantity-type properties, emit the normalized direct claim predicate (wdtn:) as a owl:DatatypeProperty instead of a owl:ObjectProperty. The predicate is not yet used for these properties, but if it is used, the values will likely be data values. 2. For properties with types that have no normalization (everything except quantity and external-id), don’t emit the (unused) normalized predicates at all. In the RdfBuilder tests, only one property (P6, quantity) retains its normalized predicates, since there is no external-id property in those tests. A separate change (I44a203bddf) rectifies this. Bug: T121274 Change-Id: Ibf4d8709c72b810c7533b96c8b508a053589228f --- M repo/includes/Rdf/PropertyRdfBuilder.php M repo/tests/phpunit/data/maintenance/dumpRdf-out.txt M repo/tests/phpunit/data/rdf/PropertyRdfBuilder/P2_all.nt M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt M repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-entities.nt M repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-redirect.nt M repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-entities.nt M repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-redirect.nt 8 files changed, 58 insertions(+), 134 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, but someone else must approve diff --git a/repo/includes/Rdf/PropertyRdfBuilder.php b/repo/includes/Rdf/PropertyRdfBuilder.php index c520417..d941618 100644 --- a/repo/includes/Rdf/PropertyRdfBuilder.php +++ b/repo/includes/Rdf/PropertyRdfBuilder.php @@ -36,33 +36,39 @@ * Write predicates linking property entity to property predicates * @param string $id * @param boolean $isObjectProperty Is the property data or object property? + * @param boolean $hasNormalization Does the property have normalized predicates? + * @param boolean $isNormalizedObjectProperty Does the property normalize to data or objects? */ - private function writePropertyPredicates( $id, $isObjectProperty ) { + private function writePropertyPredicates( + $id, + $isObjectProperty, + $hasNormalization, + $isNormalizedObjectProperty + ) { $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'directClaim' )->is( RdfVocabulary::NSP_DIRECT_CLAIM, $id ); - $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'directClaimNormalized' )->is( - RdfVocabulary::NSP_DIRECT_CLAIM_NORM, - $id - ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'claim' )->is( RdfVocabulary::NSP_CLAIM, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementProperty' )->is( RdfVocabulary::NSP_CLAIM_STATEMENT, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementValue' )->is( RdfVocabulary::NSP_CLAIM_VALUE, $id ); - $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementValueNormalized' )->is( RdfVocabulary::NSP_CLAIM_VALUE_NORM, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifier' )->is( RdfVocabulary::NSP_QUALIFIER, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifierValue' )->is( RdfVocabulary::NSP_QUALIFIER_VALUE, $id ); - $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifierValueNormalized' )->is( RdfVocabulary::NSP_QUALIFIER_VALUE_NORM, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'reference' )->is( RdfVocabulary::NSP_REFERENCE, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'referenceValue' )->is( RdfVocabulary::NSP_REFERENCE_VALUE, $id ); - $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'referenceValueNormalized' )->is( RdfVocabulary::NSP_REFERENCE_VALUE_NORM, $id ); $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'novalue' )->is( RdfVocabulary::NSP_NOVALUE, $id ); + if ( $hasNormalization ) { + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'directClaimNormalized' ) + ->is( RdfVocabulary::NSP_DIRECT_CLAIM_NORM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'statementValueNormalized' ) + ->is( RdfVocabulary::NSP_CLAIM_VALUE_NORM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'qualifierValueNormalized' ) + ->is( RdfVocabulary::NSP_QUALIFIER_VALUE_NORM, $id ); + $this->writer->say( RdfVocabulary::NS_ONTOLOGY, 'referenceValueNormalized' ) + ->is( RdfVocabulary::NSP_REFERENCE_VALUE_NORM, $id ); + } // Always object properties $this->writer->about( RdfVocabulary::NSP_CLAIM, $id )->a( 'owl', 'ObjectProperty' ); $this->writer->about( RdfVocabulary::NSP_CLAIM_VALUE, $id )->a( 'owl', 'ObjectProperty' ); $this->writer->about( RdfVocabulary::NSP_QUALIFIER_VALUE, $id )->a( 'owl', 'ObjectProperty' ); $this->writer->about( RdfVocabulary::NSP_REFERENCE_VALUE, $id )->a( 'owl', 'ObjectProperty' ); - $this->writer->about( RdfVocabulary::NSP_CLAIM_VALUE_NORM, $id )->a( 'owl', 'ObjectProperty' ); - $this->writer->about( RdfVocabulary::NSP_QUALIFIER_VALUE_NORM, $id )->a( 'owl', 'ObjectProperty' ); - $this->writer->about( RdfVocabulary::NSP_REFERENCE_VALUE_NORM, $id )->a( 'owl', 'ObjectProperty' ); - $this->writer->about( RdfVocabulary::NSP_DIRECT_CLAIM_NORM, $id )->a( 'owl', 'ObjectProperty' ); // Depending on property type if ( $isObjectProperty ) { $datatype = 'ObjectProperty'; @@ -73,6 +79,23 @@ $this->writer->about( RdfVocabulary::NSP_CLAIM_STATEMENT, $id )->a( 'owl', $datatype ); $this->writer->about( RdfVocabulary::NSP_QUALIFIER, $id )->a( 'owl', $datatype ); $this->writer->about( RdfVocabulary::NSP_REFERENCE, $id )->a( 'owl', $datatype ); + // Normalized predicates, if applicable + if ( $hasNormalization ) { + $this->writer->about( RdfVocabulary::NSP_CLAIM_VALUE_NORM, $id ) + ->a( 'owl', 'ObjectProperty' ); + $this->writer->about( RdfVocabulary::NSP_QUALIFIER_VALUE_NORM, $id ) + ->a( 'owl', 'ObjectProperty' ); + $this->writer->about( RdfVocabulary::NSP_REFERENCE_VALUE_NORM, $id ) + ->a( 'owl', 'ObjectProperty' ); + // Depending on property type + if ( $isNormalizedObjectProperty ) { + $normalizedDatatype = 'ObjectProperty'; + } else { + $normalizedDatatype = 'DatatypeProperty'; + } + $this->writer->about( RdfVocabulary::NSP_DIRECT_CLAIM_NORM, $id ) + ->a( 'owl', $normalizedDatatype ); + } } /** @@ -93,6 +116,22 @@ 'commonsMedia', 'geo-shape', 'tabular-data' + ] + ); + } + + private function propertyNormalizedIsLink( Property $property ) { + return $this->propertyIsLink( $property ) || + $property->getDataTypeId() === 'external-id'; + } + + private function propertyHasNormalization( Property $property ) { + // Also very simple for now + return in_array( + $property->getDataTypeId(), + [ + 'quantity', + 'external-id', ] ); } @@ -120,7 +159,12 @@ ->is( $this->vocabulary->getDataTypeURI( $property ) ); $id = $property->getId()->getSerialization(); - $this->writePropertyPredicates( $id, $this->propertyIsLink( $property ) ); + $this->writePropertyPredicates( + $id, + $this->propertyIsLink( $property ), + $this->propertyHasNormalization( $property ), + $this->propertyNormalizedIsLink( $property ) + ); $this->writeNovalueClass( $id ); } diff --git a/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt b/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt index 99f3bf1..4e47ca7 100644 --- a/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt +++ b/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt @@ -17,26 +17,18 @@ <fooUri/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Property> . <fooUri/P1> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#String> . <fooUri/P1> <http://wikiba.se/ontology-beta#directClaim> <fooUri/prop/direct/P1> . -<fooUri/P1> <http://wikiba.se/ontology-beta#directClaimNormalized> <fooUri/prop/direct-normalized/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#claim> <fooUri/prop/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#statementProperty> <fooUri/prop/statement/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#statementValue> <fooUri/prop/statement/value/P1> . -<fooUri/P1> <http://wikiba.se/ontology-beta#statementValueNormalized> <fooUri/prop/statement/value-normalized/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#qualifier> <fooUri/prop/qualifier/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#qualifierValue> <fooUri/prop/qualifier/value/P1> . -<fooUri/P1> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <fooUri/prop/qualifier/value-normalized/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#reference> <fooUri/prop/reference/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#referenceValue> <fooUri/prop/reference/value/P1> . -<fooUri/P1> <http://wikiba.se/ontology-beta#referenceValueNormalized> <fooUri/prop/reference/value-normalized/P1> . <fooUri/P1> <http://wikiba.se/ontology-beta#novalue> <fooUri/prop/novalue/P1> . <fooUri/prop/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/statement/value/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/qualifier/value/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/reference/value/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/statement/value-normalized/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/qualifier/value-normalized/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/reference/value-normalized/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/direct-normalized/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/direct/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <fooUri/prop/statement/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <fooUri/prop/qualifier/P1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -60,26 +52,18 @@ <fooUri/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Property> . <fooUri/P12> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#String> . <fooUri/P12> <http://wikiba.se/ontology-beta#directClaim> <fooUri/prop/direct/P12> . -<fooUri/P12> <http://wikiba.se/ontology-beta#directClaimNormalized> <fooUri/prop/direct-normalized/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#claim> <fooUri/prop/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#statementProperty> <fooUri/prop/statement/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#statementValue> <fooUri/prop/statement/value/P12> . -<fooUri/P12> <http://wikiba.se/ontology-beta#statementValueNormalized> <fooUri/prop/statement/value-normalized/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#qualifier> <fooUri/prop/qualifier/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#qualifierValue> <fooUri/prop/qualifier/value/P12> . -<fooUri/P12> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <fooUri/prop/qualifier/value-normalized/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#reference> <fooUri/prop/reference/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#referenceValue> <fooUri/prop/reference/value/P12> . -<fooUri/P12> <http://wikiba.se/ontology-beta#referenceValueNormalized> <fooUri/prop/reference/value-normalized/P12> . <fooUri/P12> <http://wikiba.se/ontology-beta#novalue> <fooUri/prop/novalue/P12> . <fooUri/prop/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/statement/value/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/qualifier/value/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/reference/value/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/statement/value-normalized/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/qualifier/value-normalized/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/reference/value-normalized/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<fooUri/prop/direct-normalized/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <fooUri/prop/direct/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <fooUri/prop/statement/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <fooUri/prop/qualifier/P12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . diff --git a/repo/tests/phpunit/data/rdf/PropertyRdfBuilder/P2_all.nt b/repo/tests/phpunit/data/rdf/PropertyRdfBuilder/P2_all.nt index 11c9256..eb85cfe 100644 --- a/repo/tests/phpunit/data/rdf/PropertyRdfBuilder/P2_all.nt +++ b/repo/tests/phpunit/data/rdf/PropertyRdfBuilder/P2_all.nt @@ -1,21 +1,14 @@ <http://acme.test/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Property> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#novalue> <http://acme.test/prop/novalue/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#String> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#referenceValue> <http://acme.test/prop/reference/value/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#statementProperty> <http://acme.test/prop/statement/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P2> . -<http://acme.test/prop/direct-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/novalue/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> . @@ -25,7 +18,6 @@ <http://acme.test/prop/reference/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/reference/value/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/statement/value-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/value/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . _:genid1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Restriction> . _:genid1 <http://www.w3.org/2002/07/owl#onProperty> <http://acme.test/prop/direct/P2> . diff --git a/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt index 911bf72..c99c5be 100644 --- a/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt +++ b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt @@ -112,7 +112,6 @@ <http://acme.test/P10> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#GeoShape> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P2> . <http://acme.test/P2> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P2> . @@ -121,7 +120,6 @@ <http://acme.test/P2> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P2> . <http://acme.test/P3> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P3> . <http://acme.test/P3> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P3> . -<http://acme.test/P3> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P3> . <http://acme.test/P3> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P3> . <http://acme.test/P3> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P3> . <http://acme.test/P3> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P3> . @@ -130,7 +128,6 @@ <http://acme.test/P3> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P3> . <http://acme.test/P4> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P4> . <http://acme.test/P4> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P4> . -<http://acme.test/P4> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P4> . <http://acme.test/P4> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P4> . <http://acme.test/P4> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P4> . <http://acme.test/P4> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P4> . @@ -139,7 +136,6 @@ <http://acme.test/P4> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P4> . <http://acme.test/P5> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P5> . <http://acme.test/P5> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P5> . -<http://acme.test/P5> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P5> . <http://acme.test/P5> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P5> . <http://acme.test/P5> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P5> . <http://acme.test/P5> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P5> . @@ -157,7 +153,6 @@ <http://acme.test/P6> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P6> . <http://acme.test/P7> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P7> . <http://acme.test/P7> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P7> . -<http://acme.test/P7> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P7> . <http://acme.test/P7> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P7> . <http://acme.test/P7> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P7> . <http://acme.test/P7> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P7> . @@ -166,7 +161,6 @@ <http://acme.test/P7> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P7> . <http://acme.test/P8> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P8> . <http://acme.test/P8> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P8> . -<http://acme.test/P8> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P8> . <http://acme.test/P8> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P8> . <http://acme.test/P8> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P8> . <http://acme.test/P8> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P8> . @@ -175,7 +169,6 @@ <http://acme.test/P8> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P8> . <http://acme.test/P9> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P9> . <http://acme.test/P9> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P9> . -<http://acme.test/P9> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P9> . <http://acme.test/P9> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P9> . <http://acme.test/P9> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P9> . <http://acme.test/P9> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P9> . @@ -184,7 +177,6 @@ <http://acme.test/P9> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P9> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P10> . @@ -247,7 +239,6 @@ _:genid10 <http://www.w3.org/2002/07/owl#someValuesFrom> <http://www.w3.org/2002/07/owl#Thing> . <http://acme.test/prop/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/direct-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . @@ -256,7 +247,6 @@ <http://acme.test/prop/statement/value/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/direct-normalized/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . @@ -265,7 +255,6 @@ <http://acme.test/prop/statement/value/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -274,7 +263,6 @@ <http://acme.test/prop/statement/value/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -283,7 +271,7 @@ <http://acme.test/prop/statement/value/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . +<http://acme.test/prop/direct-normalized/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -292,7 +280,6 @@ <http://acme.test/prop/statement/value/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -301,7 +288,6 @@ <http://acme.test/prop/statement/value/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -310,7 +296,6 @@ <http://acme.test/prop/statement/value/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/direct-normalized/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . @@ -319,64 +304,15 @@ <http://acme.test/prop/statement/value/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/direct-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P2> . -<http://acme.test/P2> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P2> . -<http://acme.test/P3> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P3> . -<http://acme.test/P3> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P3> . -<http://acme.test/P3> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P3> . -<http://acme.test/P4> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P4> . -<http://acme.test/P4> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P4> . -<http://acme.test/P4> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P4> . -<http://acme.test/P5> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P5> . -<http://acme.test/P5> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P5> . -<http://acme.test/P5> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P5> . <http://acme.test/P6> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P6> . <http://acme.test/P6> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P6> . <http://acme.test/P6> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P6> . -<http://acme.test/P7> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P7> . -<http://acme.test/P7> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P7> . -<http://acme.test/P7> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P7> . -<http://acme.test/P8> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P8> . -<http://acme.test/P8> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P8> . -<http://acme.test/P8> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P8> . -<http://acme.test/P9> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P9> . -<http://acme.test/P9> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P9> . -<http://acme.test/P9> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P9> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P10> . -<http://acme.test/prop/qualifier/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P9> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P7> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value-normalized/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/value-normalized/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/value-normalized/P6> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P5> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . diff --git a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-entities.nt b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-entities.nt index e6b72e6..6108950 100644 --- a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-entities.nt +++ b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-entities.nt @@ -38,7 +38,6 @@ <http://acme.test/P10> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#Wibblywobbly> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P10> . @@ -53,7 +52,6 @@ _:genid1 <http://www.w3.org/2002/07/owl#someValuesFrom> <http://www.w3.org/2002/07/owl#Thing> . <http://acme.test/prop/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -62,11 +60,5 @@ <http://acme.test/prop/statement/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://wikiba.se/ontology-beta#Dump> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Ontology> . <http://wikiba.se/ontology-beta#Dump> <http://www.w3.org/2002/07/owl#imports> <http://wikiba.se/ontology-1.0.owl> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P10> . -<http://acme.test/prop/qualifier/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://test.acme.test/FooQ30> <http://schema.org/name> "FooQ30"@en-x-test . <http://test.acme.test/FooQ40> <http://schema.org/name> "FooQ40"@en-x-test . diff --git a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-redirect.nt b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-redirect.nt index 1b883fe..48bb57d 100644 --- a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-redirect.nt +++ b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/full-dump-redirect.nt @@ -20,7 +20,6 @@ <http://acme.test/P10> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#Wibblywobbly> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P10> . @@ -29,7 +28,6 @@ <http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P10> . <http://acme.test/prop/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . @@ -38,9 +36,3 @@ <http://acme.test/prop/statement/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://wikiba.se/ontology-beta#Dump> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Ontology> . <http://wikiba.se/ontology-beta#Dump> <http://www.w3.org/2002/07/owl#imports> <http://wikiba.se/ontology-1.0.owl> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P10> . -<http://acme.test/prop/qualifier/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . diff --git a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-entities.nt b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-entities.nt index e1dce28..088ddd1 100644 --- a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-entities.nt +++ b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-entities.nt @@ -15,27 +15,19 @@ <http://acme.test/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Property> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#Wibblywobbly> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#statementProperty> <http://acme.test/prop/statement/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValue> <http://acme.test/prop/reference/value/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#novalue> <http://acme.test/prop/novalue/P10> . <http://acme.test/prop/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/reference/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . diff --git a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-redirect.nt b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-redirect.nt index 6087b8c..b3f9c32 100644 --- a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-redirect.nt +++ b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/truthy-dump-redirect.nt @@ -15,27 +15,19 @@ <http://acme.test/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Property> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#propertyType> <http://wikiba.se/ontology-beta#Wibblywobbly> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaim> <http://acme.test/prop/direct/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#directClaimNormalized> <http://acme.test/prop/direct-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#claim> <http://acme.test/prop/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#statementProperty> <http://acme.test/prop/statement/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValue> <http://acme.test/prop/statement/value/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#statementValueNormalized> <http://acme.test/prop/statement/value-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifier> <http://acme.test/prop/qualifier/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValue> <http://acme.test/prop/qualifier/value/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#qualifierValueNormalized> <http://acme.test/prop/qualifier/value-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#reference> <http://acme.test/prop/reference/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValue> <http://acme.test/prop/reference/value/P10> . -<http://acme.test/P10> <http://wikiba.se/ontology-beta#referenceValueNormalized> <http://acme.test/prop/reference/value-normalized/P10> . <http://acme.test/P10> <http://wikiba.se/ontology-beta#novalue> <http://acme.test/prop/novalue/P10> . <http://acme.test/prop/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/qualifier/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/reference/value/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/statement/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/qualifier/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . -<http://acme.test/prop/reference/value-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/direct/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -<http://acme.test/prop/direct-normalized/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> . <http://acme.test/prop/statement/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/qualifier/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . <http://acme.test/prop/reference/P10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#DatatypeProperty> . -- To view, visit https://gerrit.wikimedia.org/r/382445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf4d8709c72b810c7533b96c8b508a053589228f Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Lucas Werkmeister (WMDE) <lucas.werkmeis...@wikimedia.de> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com> Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits