jenkins-bot has submitted this change and it was merged.
Change subject: Add links between property entity and predicates
......................................................................
Add links between property entity and predicates
Change-Id: If568056ef831d5bd957d818b42cbdace759f8830
---
M repo/includes/rdf/RdfBuilder.php
M repo/tests/phpunit/data/rdf/Q4_props.nt
M repo/tests/phpunit/data/rdf/dump_entities.nt
3 files changed, 88 insertions(+), 0 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index 0d05207..6bef1ed 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -273,6 +273,21 @@
}
/**
+ * Write predicates linking property entity to property predicates
+ * @param string $id
+ */
+ private function writePropertyPredicates( $id ) {
+ $this->writer->say( RdfVocabulary::NS_ONTOLOGY,
'directClaim')->is( RdfVocabulary::NSP_DIRECT_CLAIM, $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, '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, 'reference'
)->is( RdfVocabulary::NSP_REFERENCE, $id );
+ $this->writer->say( RdfVocabulary::NS_ONTOLOGY,
'referenceValue' )->is( RdfVocabulary::NSP_REFERENCE_VALUE, $id );
+ }
+
+ /**
* Adds meta-information about an entity (such as the ID and type) to
the RDF graph.
*
* @todo: extract into MetaDataRdfBuilder
@@ -303,6 +318,7 @@
if( $entity instanceof Property ) {
$this->writer->say( RdfVocabulary::NS_ONTOLOGY,
'propertyType' )
->is( RdfVocabulary::NS_ONTOLOGY,
$this->vocabulary->getDataTypeName( $entity ) );
+ $this->writePropertyPredicates(
$entity->getId()->getSerialization() );
}
}
diff --git a/repo/tests/phpunit/data/rdf/Q4_props.nt
b/repo/tests/phpunit/data/rdf/Q4_props.nt
index f741521..596b5d2 100644
--- a/repo/tests/phpunit/data/rdf/Q4_props.nt
+++ b/repo/tests/phpunit/data/rdf/Q4_props.nt
@@ -101,3 +101,67 @@
<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#propertyType>
<http://www.wikidata.org/ontology-beta#String> .
<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#propertyType>
<http://www.wikidata.org/ontology-beta#Time> .
<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#propertyType>
<http://www.wikidata.org/ontology-beta#Url> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P2> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P2> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P2> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P2> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P2> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P2> .
+<http://acme.test/P2>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P2> .
+<http://acme.test/P2> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P2> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P3> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P3> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P3> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P3> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P3> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P3> .
+<http://acme.test/P3>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P3> .
+<http://acme.test/P3> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P3> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P4> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P4> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P4> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P4> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P4> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P4> .
+<http://acme.test/P4>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P4> .
+<http://acme.test/P4> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P4> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P5> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P5> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P5> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P5> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P5> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P5> .
+<http://acme.test/P5>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P5> .
+<http://acme.test/P5> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P5> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P6> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P6> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P6> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P6> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P6> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P6> .
+<http://acme.test/P6>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P6> .
+<http://acme.test/P6> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P6> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P7> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P7> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P7> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P7> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P7> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P7> .
+<http://acme.test/P7>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P7> .
+<http://acme.test/P7> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P7> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P8> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P8> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P8> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P8> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P8> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P8> .
+<http://acme.test/P8>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P8> .
+<http://acme.test/P8> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P8> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P9> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P9> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P9> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P9> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P9> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P9> .
+<http://acme.test/P9>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P9> .
+<http://acme.test/P9> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P9> .
diff --git a/repo/tests/phpunit/data/rdf/dump_entities.nt
b/repo/tests/phpunit/data/rdf/dump_entities.nt
index ccfce47..6273c7b 100644
--- a/repo/tests/phpunit/data/rdf/dump_entities.nt
+++ b/repo/tests/phpunit/data/rdf/dump_entities.nt
@@ -22,3 +22,11 @@
<http://www.wikidata.org/ontology-beta#Dump>
<http://schema.org/softwareVersion> "0.0.1" .
<http://www.wikidata.org/ontology-beta#Dump>
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Dataset> .
<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#propertyType>
<http://www.wikidata.org/ontology-beta#Wibblywobbly> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#claim>
<http://acme.test/prop/P10> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#directClaim>
<http://acme.test/prop/direct/P10> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#qualifier>
<http://acme.test/prop/qualifier/P10> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#qualifierValue>
<http://acme.test/prop/qualifier/value/P10> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#reference>
<http://acme.test/prop/reference/P10> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#referenceValue>
<http://acme.test/prop/reference/value/P10> .
+<http://acme.test/P10>
<http://www.wikidata.org/ontology-beta#statementProperty>
<http://acme.test/prop/statement/P10> .
+<http://acme.test/P10> <http://www.wikidata.org/ontology-beta#statementValue>
<http://acme.test/prop/statement/value/P10> .
--
To view, visit https://gerrit.wikimedia.org/r/202461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If568056ef831d5bd957d818b42cbdace759f8830
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
