Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/276654
Change subject: Add link classification by site type ...................................................................... Add link classification by site type Two new elements are added: <http://en.wikipedia.org/wiki/Duck> schema:isPartOf <http://en.wikipedia.org/> <http://en.wikipedia.org/wiki/Duck> wikibase:wikiGroup "wikipedia" Bug: T127574 Change-Id: Ia6dc38760e3e9f251832f8f07351c33b0eddd93a --- M docs/ontology.owl M repo/includes/Rdf/SiteLinksRdfBuilder.php M repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt M repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt M repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt M repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt M repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks.nt M repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks_ruwiki.nt M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php M repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php 10 files changed, 39 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/54/276654/1 diff --git a/docs/ontology.owl b/docs/ontology.owl index ecb98b2..0f0c3d8 100644 --- a/docs/ontology.owl +++ b/docs/ontology.owl @@ -216,13 +216,13 @@ <rdfs:comment>Badge on the Wiki page.</rdfs:comment> <rdfs:range rdf:resource="&wikibase;Item"/> </owl:ObjectProperty> - + <owl:ObjectProperty rdf:about="&wikibase;directClaim"> <rdfs:label>directClaim</rdfs:label> <rdfs:comment>Link between Wikibase Property and direct claim predicate.</rdfs:comment> <rdfs:domain rdf:resource="&wikibase;Property"/> </owl:ObjectProperty> - + <owl:ObjectProperty rdf:about="&wikibase;claim"> <rdfs:label>claim</rdfs:label> <rdfs:comment>Link between Wikibase Property and claim predicate.</rdfs:comment> @@ -355,4 +355,9 @@ <rdfs:range rdf:resource="&xsd;dateTime"/> </owl:DatatypeProperty> + <owl:DatatypeProperty rdf:about="&wikibase;wikiGroup"> + <rdfs:label>wikiGroup</rdfs:label> + <rdfs:comment>Wiki group that the article belongs to.</rdfs:comment> + </owl:DatatypeProperty> + </rdf:RDF> diff --git a/repo/includes/Rdf/SiteLinksRdfBuilder.php b/repo/includes/Rdf/SiteLinksRdfBuilder.php index 3e0d8cc..9bb5391 100644 --- a/repo/includes/Rdf/SiteLinksRdfBuilder.php +++ b/repo/includes/Rdf/SiteLinksRdfBuilder.php @@ -91,11 +91,16 @@ $url = $baseUrl; } + $group = $site->getGroup(); + $siteUrl = parse_url( $url, PHP_URL_SCHEME ) . '://' . parse_url( $url, PHP_URL_HOST ) . "/"; + $this->writer->about( $url ) ->a( RdfVocabulary::NS_SCHEMA_ORG, 'Article' ) ->say( RdfVocabulary::NS_SCHEMA_ORG, 'about' )->is( RdfVocabulary::NS_ENTITY, $entityLName ) ->say( RdfVocabulary::NS_SCHEMA_ORG, 'inLanguage' )->text( - $this->vocabulary->getCanonicalLanguageCode( $site->getLanguageCode() ) ); + $this->vocabulary->getCanonicalLanguageCode( $site->getLanguageCode() ) ) + ->say( RdfVocabulary::NS_ONTOLOGY, 'wikiGroup' )->text( $group ) + ->say( RdfVocabulary::NS_SCHEMA_ORG, 'isPartOf' )->is( $siteUrl ); foreach ( $siteLink->getBadges() as $badge ) { $this->writer diff --git a/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt index 5bbcbcd..88805ab 100644 --- a/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt +++ b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt @@ -8,6 +8,10 @@ <http://enwiki.acme.test/San%20Francisco> <http://schema.org/about> <http://acme.test/Q3> . <http://enwiki.acme.test/San%20Francisco> <http://schema.org/inLanguage> "en" . <http://enwiki.acme.test/San%20Francisco> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://enwiki.acme.test/San%20Francisco> <http://wikiba.se/ontology-beta#wikiGroup> "wikipedia" . +<http://enwiki.acme.test/San%20Francisco> <http://schema.org/isPartOf> <http://enwiki.acme.test/> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/about> <http://acme.test/Q3> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/inLanguage> "ru" . -<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . \ No newline at end of file +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#wikiGroup> "none" . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/isPartOf> <http://ruwiki.acme.test/> . diff --git a/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt index accd48a..2674141 100644 --- a/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt +++ b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt @@ -6,6 +6,10 @@ <http://enwiki.acme.test/San%20Francisco> <http://schema.org/about> <http://acme.test/Q3> . <http://enwiki.acme.test/San%20Francisco> <http://schema.org/inLanguage> "en" . <http://enwiki.acme.test/San%20Francisco> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://enwiki.acme.test/San%20Francisco> <http://wikiba.se/ontology-beta#wikiGroup> "wikipedia" . +<http://enwiki.acme.test/San%20Francisco> <http://schema.org/isPartOf> <http://enwiki.acme.test/> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/about> <http://acme.test/Q3> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/inLanguage> "ru" . -<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . \ No newline at end of file +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#wikiGroup> "none" . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/isPartOf> <http://ruwiki.acme.test/> . \ No newline at end of file diff --git a/repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt b/repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt index dfd438b..5b52da4 100644 --- a/repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt +++ b/repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt @@ -8,8 +8,12 @@ <http://enwiki.acme.test/San%20Francisco> <http://schema.org/about> <http://acme.test/Q5> . <http://enwiki.acme.test/San%20Francisco> <http://schema.org/inLanguage> "en" . <http://enwiki.acme.test/San%20Francisco> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://enwiki.acme.test/San%20Francisco> <http://wikiba.se/ontology-beta#wikiGroup> "wikipedia" . +<http://enwiki.acme.test/San%20Francisco> <http://schema.org/isPartOf> <http://enwiki.acme.test/> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/about> <http://acme.test/Q5> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/inLanguage> "ru" . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#badge> <http://acme.test/Q42> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#badge> <http://acme.test/Q666> . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#wikiGroup> "none" . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/isPartOf> <http://ruwiki.acme.test/> . diff --git a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt index 87e5e04..99a4647 100644 --- a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt +++ b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt @@ -17,6 +17,8 @@ <http://test.acme.test/Foo> <http://schema.org/about> <http://acme.test/Q30> . <http://test.acme.test/Foo> <http://schema.org/inLanguage> "en-x-test" . <http://test.acme.test/Foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://test.acme.test/Foo> <http://schema.org/isPartOf> <http://test.acme.test/> . +<http://test.acme.test/Foo> <http://wikiba.se/ontology-beta#wikiGroup> "acmetest" . <http://wikiba.se/ontology-beta#Dump> <http://creativecommons.org/ns#license> <http://creativecommons.org/publicdomain/zero/1.0/> . <http://wikiba.se/ontology-beta#Dump> <http://schema.org/dateModified> "1970-01-12T13:46:40Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> . <http://wikiba.se/ontology-beta#Dump> <http://schema.org/softwareVersion> "0.0.1" . diff --git a/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks.nt b/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks.nt index c5d9090..afee02a 100644 --- a/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks.nt +++ b/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks.nt @@ -1,6 +1,10 @@ <http://enwiki.acme.test/San%20Francisco> <http://schema.org/about> <http://acme.test/Q3> . <http://enwiki.acme.test/San%20Francisco> <http://schema.org/inLanguage> "en" . <http://enwiki.acme.test/San%20Francisco> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://enwiki.acme.test/San%20Francisco> <http://wikiba.se/ontology-beta#wikiGroup> "wikipedia" . +<http://enwiki.acme.test/San%20Francisco> <http://schema.org/isPartOf> <http://enwiki.acme.test/> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/about> <http://acme.test/Q3> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/inLanguage> "ru" . -<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . \ No newline at end of file +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#wikiGroup> "none" . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/isPartOf> <http://ruwiki.acme.test/> . \ No newline at end of file diff --git a/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks_ruwiki.nt b/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks_ruwiki.nt index 1d6f3eb..68aba21 100644 --- a/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks_ruwiki.nt +++ b/repo/tests/phpunit/data/rdf/SiteLinksRdfBuilder/Q3_sitelinks_ruwiki.nt @@ -1,3 +1,5 @@ <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/about> <http://acme.test/Q3> . <http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/inLanguage> "ru" . -<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . \ No newline at end of file +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://wikiba.se/ontology-beta#wikiGroup> "none" . +<http://ruwiki.acme.test/%D0%A1%D0%B0%D0%BD%20%D0%A4%D1%80%D0%B0%D0%BD%D1%86%D0%B8%D1%81%D0%BA%D0%BE> <http://schema.org/isPartOf> <http://ruwiki.acme.test/> . diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php index 04b2515..66653a7 100644 --- a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php +++ b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php @@ -70,6 +70,7 @@ $wiki = new Site(); $wiki->setGlobalId( 'test' ); $wiki->setLanguageCode( 'test' ); + $wiki->setGroup( 'acmetest' ); $wiki->setLinkPath( 'http://test.acme.test/$1' ); $list['test'] = $wiki; diff --git a/repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php b/repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php index 23a1784..49b2fe8 100644 --- a/repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php +++ b/repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php @@ -164,6 +164,7 @@ $wiki->setGlobalId( 'enwiki' ); $wiki->setLanguageCode( 'en' ); $wiki->setLinkPath( 'http://enwiki.acme.test/$1' ); + $wiki->setGroup('wikipedia'); $list['enwiki'] = $wiki; $wiki = new Site(); -- To view, visit https://gerrit.wikimedia.org/r/276654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6dc38760e3e9f251832f8f07351c33b0eddd93a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Smalyshev <smalys...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
