jenkins-bot has submitted this change and it was merged. 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/> wikibase:wikiGroup "wikipedia" Bug: T127574 Change-Id: Ia6dc38760e3e9f251832f8f07351c33b0eddd93a --- M docs/ontology.owl M repo/includes/Rdf/RdfBuilder.php M repo/includes/Rdf/SiteLinksRdfBuilder.php M repo/tests/phpunit/data/maintenance/dumpRdf-log.txt M repo/tests/phpunit/data/maintenance/dumpRdf-out.txt 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/JsonDumpGeneratorTest.php M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php M repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php M repo/tests/phpunit/maintenance/dumpRdfTest.php 15 files changed, 118 insertions(+), 15 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/ontology.owl b/docs/ontology.owl index ecb98b2..3022055 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 site belongs to.</rdfs:comment> + </owl:DatatypeProperty> + </rdf:RDF> diff --git a/repo/includes/Rdf/RdfBuilder.php b/repo/includes/Rdf/RdfBuilder.php index d7d8b33..0d138a1 100644 --- a/repo/includes/Rdf/RdfBuilder.php +++ b/repo/includes/Rdf/RdfBuilder.php @@ -121,7 +121,10 @@ // placing this last produces more readable output since all entity things are together if ( $this->shouldProduce( RdfProducer::PRODUCE_SITELINKS ) ) { - $this->builders[] = new SiteLinksRdfBuilder( $vocabulary, $writer, $sites ); + $builder = new SiteLinksRdfBuilder( $vocabulary, $writer, $sites ); + // We can use the same bag since namespaces are different + $builder->setDedupeBag( $this->dedupBag ); + $this->builders[] = $builder; } } diff --git a/repo/includes/Rdf/SiteLinksRdfBuilder.php b/repo/includes/Rdf/SiteLinksRdfBuilder.php index 3e0d8cc..47347e4 100644 --- a/repo/includes/Rdf/SiteLinksRdfBuilder.php +++ b/repo/includes/Rdf/SiteLinksRdfBuilder.php @@ -42,6 +42,11 @@ private $sites; /** + * @var DedupeBag + */ + private $dedupeBag; + + /** * @param RdfVocabulary $vocabulary * @param RdfWriter $writer * @param SiteList $siteLookup @@ -52,6 +57,21 @@ $this->writer = $writer; $this->siteLookup = $siteLookup; $this->sites = $sites === null ? null : array_flip( $sites ); + $this->dedupeBag = new NullDedupeBag(); + } + + /** + * @return DedupeBag + */ + public function getDedupeBag() { + return $this->dedupeBag; + } + + /** + * @param DedupeBag $dedupeBag + */ + public function setDedupeBag( DedupeBag $dedupeBag ) { + $this->dedupeBag = $dedupeBag; } /** @@ -91,17 +111,31 @@ $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_SCHEMA_ORG, 'isPartOf' )->is( $siteUrl ); foreach ( $siteLink->getBadges() as $badge ) { $this->writer ->say( RdfVocabulary::NS_ONTOLOGY, 'badge' ) ->is( RdfVocabulary::NS_ENTITY, $this->vocabulary->getEntityLName( $badge ) ); } + + /* Write group of the site only once. + * We are using URL as namespace to ensure it is not cut off. + * Since we do not have too may distinct sites, memory cost is small. + */ + if ( !$this->dedupeBag->alreadySeen( $group, $siteUrl ) ) { + $this->writer->about( $siteUrl ) + ->say( RdfVocabulary::NS_ONTOLOGY, 'wikiGroup' )->text( $group ); + } + } } diff --git a/repo/tests/phpunit/data/maintenance/dumpRdf-log.txt b/repo/tests/phpunit/data/maintenance/dumpRdf-log.txt index f825560..0f0bebd 100644 --- a/repo/tests/phpunit/data/maintenance/dumpRdf-log.txt +++ b/repo/tests/phpunit/data/maintenance/dumpRdf-log.txt @@ -1,2 +1,2 @@ Dumping shard 0/1 -Processed 4 entities. +Processed 5 entities. diff --git a/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt b/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt index 3ccfb58..f46b508 100644 --- a/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt +++ b/repo/tests/phpunit/data/maintenance/dumpRdf-out.txt @@ -106,10 +106,27 @@ <https://en.wikipedia.org/wiki/Berlin> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . <https://en.wikipedia.org/wiki/Berlin> <http://schema.org/about> <fooUri/Q2> . <https://en.wikipedia.org/wiki/Berlin> <http://schema.org/inLanguage> "en" . +<https://en.wikipedia.org/wiki/Berlin> <http://schema.org/isPartOf> <https://en.wikipedia.org/> . +<https://en.wikipedia.org/> <http://wikiba.se/ontology-beta#wikiGroup> "wikipedia" . <https://de.wikipedia.org/wiki/England> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . <https://de.wikipedia.org/wiki/England> <http://schema.org/about> <fooUri/Q2> . <https://de.wikipedia.org/wiki/England> <http://schema.org/inLanguage> "de" . +<https://de.wikipedia.org/wiki/England> <http://schema.org/isPartOf> <https://de.wikipedia.org/> . <https://de.wikipedia.org/wiki/England> <http://wikiba.se/ontology-beta#badge> <fooUri/Q1> . +<https://de.wikipedia.org/> <http://wikiba.se/ontology-beta#wikiGroup> "wikipedia" . <fooUri/reference/2d8eac3c95db6407b057e9883971cbdb562d6473> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Reference> . <fooUri/reference/2d8eac3c95db6407b057e9883971cbdb562d6473> <fooUri/prop/reference/P12> "refSnakVal" . <fooUri/reference/2d8eac3c95db6407b057e9883971cbdb562d6473> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <fooUri/prop/novalue/P12> . +<acme/EntityData/Q4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Dataset> . +<acme/EntityData/Q4> <http://schema.org/about> <fooUri/Q4> . +<acme/EntityData/Q4> <http://schema.org/version> "4"^^<http://www.w3.org/2001/XMLSchema#integer> . +<acme/EntityData/Q4> <http://schema.org/dateModified> "2000-01-01T00:00:00Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> . +<fooUri/Q4> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Item> . +<https://en.wikipedia.org/wiki/San%20Jose> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<https://en.wikipedia.org/wiki/San%20Jose> <http://schema.org/about> <fooUri/Q4> . +<https://en.wikipedia.org/wiki/San%20Jose> <http://schema.org/inLanguage> "en" . +<https://en.wikipedia.org/wiki/San%20Jose> <http://schema.org/isPartOf> <https://en.wikipedia.org/> . +<https://de.wikipedia.org/wiki/USA> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<https://de.wikipedia.org/wiki/USA> <http://schema.org/about> <fooUri/Q4> . +<https://de.wikipedia.org/wiki/USA> <http://schema.org/inLanguage> "de" . +<https://de.wikipedia.org/wiki/USA> <http://schema.org/isPartOf> <https://de.wikipedia.org/> . diff --git a/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt index 5bbcbcd..20eb528 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/> <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/> <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..e4d3953 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/> <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/> <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..0149b53 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/> <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/> <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..da7d5e0 100644 --- a/repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt +++ b/repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt @@ -6,6 +6,10 @@ <http://acme.test/Q30> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Item> . <http://acme.test/Q30> <http://www.w3.org/2000/01/rdf-schema#label> "label:Q30"@en . <http://acme.test/Q30> <http://www.w3.org/2004/02/skos/core#prefLabel> "label:Q30"@en . +<http://acme.test/Q40> <http://schema.org/name> "label:Q40"@en . +<http://acme.test/Q40> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://wikiba.se/ontology-beta#Item> . +<http://acme.test/Q40> <http://www.w3.org/2000/01/rdf-schema#label> "label:Q40"@en . +<http://acme.test/Q40> <http://www.w3.org/2004/02/skos/core#prefLabel> "label:Q40"@en . <http://data.acme.test/P10> <http://schema.org/about> <http://acme.test/P10> . <http://data.acme.test/P10> <http://schema.org/dateModified> "1970-01-12T13:46:40Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> . <http://data.acme.test/P10> <http://schema.org/version> "12"^^<http://www.w3.org/2001/XMLSchema#integer> . @@ -14,9 +18,19 @@ <http://data.acme.test/Q30> <http://schema.org/dateModified> "1970-01-12T13:46:40Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> . <http://data.acme.test/Q30> <http://schema.org/version> "12"^^<http://www.w3.org/2001/XMLSchema#integer> . <http://data.acme.test/Q30> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Dataset> . -<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://data.acme.test/Q40> <http://schema.org/about> <http://acme.test/Q40> . +<http://data.acme.test/Q40> <http://schema.org/dateModified> "1970-01-12T13:46:40Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> . +<http://data.acme.test/Q40> <http://schema.org/version> "12"^^<http://www.w3.org/2001/XMLSchema#integer> . +<http://data.acme.test/Q40> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Dataset> . +<http://test.acme.test/FooQ30> <http://schema.org/about> <http://acme.test/Q30> . +<http://test.acme.test/FooQ30> <http://schema.org/inLanguage> "en-x-test" . +<http://test.acme.test/FooQ30> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://test.acme.test/FooQ30> <http://schema.org/isPartOf> <http://test.acme.test/> . +<http://test.acme.test/FooQ40> <http://schema.org/about> <http://acme.test/Q40> . +<http://test.acme.test/FooQ40> <http://schema.org/inLanguage> "en-x-test" . +<http://test.acme.test/FooQ40> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Article> . +<http://test.acme.test/FooQ40> <http://schema.org/isPartOf> <http://test.acme.test/> . +<http://test.acme.test/> <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..25ae0c7 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/> <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/> <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..83a3ade 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/> <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/JsonDumpGeneratorTest.php b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php index 6de9f33..39a080b 100644 --- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php +++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php @@ -88,7 +88,7 @@ protected function makeEntity( EntityId $id ) { if ( $id instanceof ItemId ) { $entity = new Item( $id ); - $entity->getSiteLinkList()->addNewSiteLink( 'test', 'Foo' ); + $entity->getSiteLinkList()->addNewSiteLink( 'test', 'Foo' . $id->getSerialization() ); } elseif ( $id instanceof PropertyId ) { $entity = new Property( $id, null, 'wibblywobbly' ); } else { diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php index 04b2515..4b359f5 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; @@ -148,11 +149,12 @@ public function idProvider() { $p10 = new PropertyId( 'P10' ); $q30 = new ItemId( 'Q30' ); + $q40 = new ItemId( 'Q40' ); $q4242 = new ItemId( 'Q4242' ); // hardcoded to be a redirect return array( 'empty' => array( array(), 'empty' ), - 'some entities' => array( array( $p10, $q30 ), 'entities' ), + 'some entities' => array( array( $p10, $q30, $q40 ), 'entities' ), 'redirect' => array( array( $p10, $q4242 ), 'redirect' ), ); } diff --git a/repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php b/repo/tests/phpunit/includes/Rdf/RdfBuilderTestData.php index 23a1784..31d340e 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(); diff --git a/repo/tests/phpunit/maintenance/dumpRdfTest.php b/repo/tests/phpunit/maintenance/dumpRdfTest.php index 69ba754..0b0455e 100644 --- a/repo/tests/phpunit/maintenance/dumpRdfTest.php +++ b/repo/tests/phpunit/maintenance/dumpRdfTest.php @@ -111,7 +111,16 @@ 'GUID2' ) ) ) - ) + ), + new Item( + new ItemId( 'Q4' ), + null, + new SiteLinkList( array( + new SiteLink( 'enwiki', 'San Jose' ), + new SiteLink( 'dewiki', 'USA' ) + ) ), + null + ), ); foreach ( $testEntities as $key => $testEntity ) { -- To view, visit https://gerrit.wikimedia.org/r/276654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6dc38760e3e9f251832f8f07351c33b0eddd93a Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Smalyshev <[email protected]> Gerrit-Reviewer: Aude <[email protected]> Gerrit-Reviewer: Daniel Kinzler <[email protected]> Gerrit-Reviewer: JanZerebecki <[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
