# HG changeset patch # User ymh # Date 1453303300 -3600 # Node ID af85c436048f57b6c123ac6fc9f1ba3d1da4f311 # Parent 8e5fcebb901824937b08b47b51430e80c0a6f6e9 change edm:WebResources to edm:WebResources diff -r 8e5fcebb9018 -r af85c436048f server/src/app/Libraries/Mappers/CocoonSoundRdfMapper.php --- a/server/src/app/Libraries/Mappers/CocoonSoundRdfMapper.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/app/Libraries/Mappers/CocoonSoundRdfMapper.php Wed Jan 20 16:21:40 2016 +0100 @@ -89,7 +89,7 @@ } /** - * Build teh webresources + * Build the webresource */ protected function mapWebResources($res, $outputGraph) { @@ -105,7 +105,7 @@ // build master webresources $masterReprUrl = $res->get($this->inputGraph->resource('http://crdo.risc.cnrs.fr/schemas/master')); if(! is_null($masterReprUrl)) { - $masterWebResource = $outputGraph->resource($masterReprUrl, 'edm:WebResources'); + $masterWebResource = $outputGraph->resource($masterReprUrl, 'edm:WebResource'); if(!is_null($extent)) { $masterWebResource->addLiteral($outputGraph->resource('http://purl.org/dc/terms/extent'),$extent); } @@ -125,7 +125,7 @@ // build others foreach($res->all($this->inputGraph->resource('http://purl.org/dc/terms/isFormatOf')) as $reprUrl) { - $webResource = $outputGraph->resource($reprUrl, 'edm:WebResources'); + $webResource = $outputGraph->resource($reprUrl, 'edm:WebResource'); if(!is_null($extent)) { $webResource->addLiteral($outputGraph->resource('http://purl.org/dc/terms/extent'),$extent); } diff -r 8e5fcebb9018 -r af85c436048f server/src/app/Libraries/Mappers/CocoonTextRdfMapper.php --- a/server/src/app/Libraries/Mappers/CocoonTextRdfMapper.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/app/Libraries/Mappers/CocoonTextRdfMapper.php Wed Jan 20 16:21:40 2016 +0100 @@ -150,7 +150,7 @@ // build others foreach($res->all($this->inputGraph->resource('http://purl.org/dc/terms/isFormatOf')) as $reprUrl) { - $webResource = $outputGraph->resource($reprUrl, 'edm:WebResources'); + $webResource = $outputGraph->resource($reprUrl, 'edm:WebResource'); $mimetype = Utils::getMimetype($reprUrl); $webResource->addLiteral('http://purl.org/dc/elements/1.1/format', Literal::create($mimetype, null, $outputGraph->resource('http://purl.org/dc/terms/IMT'))); diff -r 8e5fcebb9018 -r af85c436048f server/src/app/Libraries/Mergers/CocoonSoundRdfMerger.php --- a/server/src/app/Libraries/Mergers/CocoonSoundRdfMerger.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/app/Libraries/Mergers/CocoonSoundRdfMerger.php Wed Jan 20 16:21:40 2016 +0100 @@ -12,7 +12,7 @@ // @prefix skos: . // @prefix owl: . // -// +// // a ore:Aggregation ; // edm:aggregatedCHO ; // edm:provider "Corpus de la Parole"@fr ; @@ -63,14 +63,14 @@ // ] . // // -// a edm:WebResources ; +// a edm:WebResource ; // dc:extent "PT0H47M16S" ; // dc11:format "audio/x-wav"^^dc:IMT ; // dc:created "1969-04-11"^^dc:W3CDTF ; // dc:issued "2014-12-05T15:00:19+01:00"^^dc:W3CDTF . // // -// a edm:WebResources ; +// a edm:WebResource ; // dc:extent "PT0H47M16S" ; // dc11:format "audio/x-wav"^^dc:IMT ; // edm:isDerivativeOf ; @@ -78,7 +78,7 @@ // dc:issued "2014-12-05T15:00:19+01:00"^^dc:W3CDTF . // // -// a edm:WebResources ; +// a edm:WebResource ; // dc:extent "PT0H47M16S" ; // dc11:format "audio/mpeg"^^dc:IMT ; // edm:isDerivativeOf ; @@ -91,7 +91,7 @@ return [ 'http://www.openarchives.org/ore/terms/Aggregation' => 'mergeOreAggregation', 'http://www.europeana.eu/schemas/edm/ProvidedCHO' => 'mergeEdmProvidedCHO', - 'http://www.europeana.eu/schemas/edm/WebResources' => 'mergeEdmWebResources', + 'http://www.europeana.eu/schemas/edm/WebResource' => 'mergeEdmWebResources', 'http://www.europeana.eu/schemas/edm/Place' => 'mergeDcSpatialBlankNode' ]; } diff -r 8e5fcebb9018 -r af85c436048f server/src/app/Models/Document.php --- a/server/src/app/Models/Document.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/app/Models/Document.php Wed Jan 20 16:21:40 2016 +0100 @@ -176,7 +176,7 @@ $master = $this->get(''); $masterUrl = is_null($master)?null:$master->getUri(); - foreach($this->graph->allOfType("") as $webResource) { + foreach($this->graph->allOfType("") as $webResource) { $extent = $webResource->getLiteral(""); $extent = is_null($extent)?null:$extent->getValue(); $extent_ms = Utils::iso8601IntervalToMillis($extent); diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/Controllers/DocumentListControllerTest.php --- a/server/src/tests/Controllers/DocumentListControllerTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/Controllers/DocumentListControllerTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -24,7 +24,7 @@ "-15.77972"^^xsd:float ; "-47.92972"^^xsd:float . - a ; + <###h#ttp://purl.org/poi/corpusdelaparole.huma-num.fr/crdo-BOD092_SOUND> a ; ; "Corpus de la Parole"@fr ; , ; @@ -33,20 +33,20 @@ "Corpus de la Parole"@fr ; . - a ; + a ; "video/mp4"^^ ; "2001-03"^^ ; "PT00H01M54S" ; "2013-06-04T22:39:21+02:00"^^ . - a ; + a ; "video/mp4"^^ ; "2001-03"^^ ; "PT00H01M54S" ; "2013-06-04T22:39:21+02:00"^^ ; . - a ; + a ; "video/ogg"^^ ; "2001-03"^^ ; "PT00H01M54S" ; diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/Models/DocumentTest.php --- a/server/src/tests/Models/DocumentTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/Models/DocumentTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -19,7 +19,7 @@ @prefix skos: . @prefix owl: . - + <###h#ttp://purl.org/poi/corpusdelaparole.huma-num.fr/crdo-CFPP2000_35_SOUND> a ore:Aggregation ; edm:aggregatedCHO ; edm:provider "Corpus de la Parole"@fr ; @@ -60,14 +60,14 @@ ] . - a edm:WebResources ; + a edm:WebResource ; dc:extent "PT48M26S" ; dc11:format "audio/x-wav"^^dc:IMT ; dc:created "2010-11-17"^^dc:W3CDTF ; dc:issued "2013-10-12T14:35:57+02:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc:extent "PT48M26S" ; dc11:format "audio/x-wav"^^dc:IMT ; edm:isDerivativeOf ; @@ -75,7 +75,7 @@ dc:issued "2013-10-12T14:35:57+02:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc:extent "PT48M26S" ; dc11:format "audio/mpeg"^^dc:IMT ; edm:isDerivativeOf ; @@ -83,13 +83,13 @@ dc:issued "2013-10-12T14:35:57+02:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc11:format "application/xml"^^dc:IMT ; dc:created "2010-11-17"^^dc:W3CDTF ; dc:issued "2013-11-04T22:20:07+01:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc11:format "application/xhtml+xml"^^dc:IMT ; dc:created "2010-11-17"^^dc:W3CDTF ; dc:issued "2013-11-04T22:20:07+01:00"^^dc:W3CDTF . diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php --- a/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -45,7 +45,7 @@ owl:sameAs ; "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^ , "FR"^^ , "France, Alsace"@fr . - a ; + <###h#ttp://purl.org/poi/corpusdelaparole.huma-num.fr/crdo-ALA_738> a ; ; "Atlas linguistiques, cultures et parlers régionaux de France" ; , ; @@ -54,20 +54,20 @@ "Corpus de la Parole"@fr ; . - a ; + a ; "audio/mpeg"^^ ; "1996"^^ ; "PT01H11M29S" ; "2014-11-10T14:27:08+01:00"^^ ; . - a ; + a ; "audio/x-wav"^^ ; "1996"^^ ; "PT01H11M29S" ; "2014-11-10T14:27:08+01:00"^^ . - a ; + a ; "audio/x-wav"^^ ; "1996"^^ ; "PT01H11M29S" ; diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/Repositories/DocumentRepositoryTest.php --- a/server/src/tests/Repositories/DocumentRepositoryTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/Repositories/DocumentRepositoryTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -19,57 +19,57 @@ @prefix fn: . _:genid-2267740936ad4d04a567e6787732f0dd-genid1 a ; - owl:sameAs ; - "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^ , "FR"^^ , "France, Alsace"@fr . + owl:sameAs ; + "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^ , "FR"^^ , "France, Alsace"@fr . - a ; - ; - "Atlas linguistiques, cultures et parlers régionaux de France" ; - , ; - ; - ; - "Corpus de la Parole"@fr ; - . + <###h#ttp://purl.org/poi/corpusdelaparole.huma-num.fr/crdo-ALA_738> a ; + ; + "Atlas linguistiques, cultures et parlers régionaux de France" ; + , ; + ; + ; + "Corpus de la Parole"@fr ; + . - a ; - "audio/mpeg"^^ ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ ; - . + a ; + "audio/mpeg"^^ ; + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ ; + . - a ; - "audio/x-wav"^^ ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ . + a ; + "audio/x-wav"^^ ; + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ . - a ; - "audio/x-wav"^^ ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ ; - . + a ; + "audio/x-wav"^^ ; + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ ; + . a ; - "1996"^^ ; - "PT01H11M29S" ; - "2014-11-10T14:27:08+01:00"^^ ; - , ; - "Extrait des enquêtes dialectologiques en vue de constituer un atlas linguistique de l'Alsace."@fr ; - ; - "Atlas linguistiques, cultures et parlers régionaux de France" ; - "Copyright (c) Département de dialectologie alsacienne et mosellane de l'Université de Strasbourg" ; - , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , "anthropological_linguistics"^^ , "lexicography"^^ , "phonetics"^^ ; - "Atlas Linguistique et ethnographique de l'Alsace - Enquetes sur la conscience linguistique - ALA_738"@fr ; - , , , "dialogue"^^ , "primary_text"^^ ; - "Freely available for non-commercial use" ; - "2004-07-03"^^ ; - , ; - ; - _:genid-2267740936ad4d04a567e6787732f0dd-genid1 ; - ; - , . + "1996"^^ ; + "PT01H11M29S" ; + "2014-11-10T14:27:08+01:00"^^ ; + , ; + "Extrait des enquêtes dialectologiques en vue de constituer un atlas linguistique de l'Alsace."@fr ; + ; + "Atlas linguistiques, cultures et parlers régionaux de France" ; + "Copyright (c) Département de dialectologie alsacienne et mosellane de l'Université de Strasbourg" ; + , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , "anthropological_linguistics"^^ , "lexicography"^^ , "phonetics"^^ ; + "Atlas Linguistique et ethnographique de l'Alsace - Enquetes sur la conscience linguistique - ALA_738"@fr ; + , , , "dialogue"^^ , "primary_text"^^ ; + "Freely available for non-commercial use" ; + "2004-07-03"^^ ; + , ; + ; + _:genid-2267740936ad4d04a567e6787732f0dd-genid1 ; + ; + , . EOT; function __construct(string $name = null) { diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/libraries/Mappers/CocoonSoundRdfMapperTest.php --- a/server/src/tests/libraries/Mappers/CocoonSoundRdfMapperTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/libraries/Mappers/CocoonSoundRdfMapperTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -434,9 +434,9 @@ */ public function testWebResources() { - $resources = $this->resGraphes['BASE']->allOfType('edm:WebResources'); + $resources = $this->resGraphes['BASE']->allOfType('edm:WebResource'); - $this->assertCount(3, $resources, "Must found three webresources"); + $this->assertCount(3, $resources, "Must found three webresource"); $aggregation = $this->resGraphes['BASE']->resource(CocoonSoundRdfMapperTest::TEST_GRAPH_URI); @@ -473,7 +473,7 @@ */ public function testWebResourcesDate() { - $resources = $this->resGraphes['BASE']->allOfType('edm:WebResources'); + $resources = $this->resGraphes['BASE']->allOfType('edm:WebResource'); foreach ($resources as $wres) { $this->assertFalse($wres->hasProperty("http://purl.org/dc/terms/available"),"web resource must not have http://purl.org/dc/terms/available"); diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/libraries/Mappers/CocoonTextRdfMapperTest.php --- a/server/src/tests/libraries/Mappers/CocoonTextRdfMapperTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/libraries/Mappers/CocoonTextRdfMapperTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -158,9 +158,9 @@ */ public function testWebResources() { - $resources = $this->resGraphes['BASE']->allOfType('edm:WebResources'); + $resources = $this->resGraphes['BASE']->allOfType('edm:WebResource'); - $this->assertCount(2, $resources, "Must found three webresources"); + $this->assertCount(2, $resources, "Must found three webresource"); $aggregation = $this->resGraphes['BASE']->resource(CocoonTextRdfMapperTest::TEST_GRAPH_URI); @@ -180,7 +180,7 @@ */ public function testWebResourcesDate() { - $resources = $this->resGraphes['BASE']->allOfType('edm:WebResources'); + $resources = $this->resGraphes['BASE']->allOfType('edm:WebResource'); foreach ($resources as $wres) { $this->assertFalse($wres->hasProperty("http://purl.org/dc/terms/available"),"web resource must not have http://purl.org/dc/terms/available"); diff -r 8e5fcebb9018 -r af85c436048f server/src/tests/libraries/Mergers/CocoonSoundRdfMergerTest.php --- a/server/src/tests/libraries/Mergers/CocoonSoundRdfMergerTest.php Wed Jan 20 09:56:36 2016 +0100 +++ b/server/src/tests/libraries/Mergers/CocoonSoundRdfMergerTest.php Wed Jan 20 16:21:40 2016 +0100 @@ -26,7 +26,7 @@ @prefix skos: . @prefix owl: . - + <###h#ttp://purl.org/poi/corpusdelaparole.huma-num.fr/crdo-CFPP2000_35_SOUND> a ore:Aggregation ; edm:aggregatedCHO ; edm:provider "Corpus de la Parole"@fr ; @@ -67,14 +67,14 @@ ] . - a edm:WebResources ; + a edm:WebResource ; dc:extent "PT48M26S" ; dc11:format "audio/x-wav"^^dc:IMT ; dc:created "2010-11-17"^^dc:W3CDTF ; dc:issued "2013-10-12T14:35:57+02:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc:extent "PT48M26S" ; dc11:format "audio/x-wav"^^dc:IMT ; edm:isDerivativeOf ; @@ -82,7 +82,7 @@ dc:issued "2013-10-12T14:35:57+02:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc:extent "PT48M26S" ; dc11:format "audio/mpeg"^^dc:IMT ; edm:isDerivativeOf ; @@ -101,7 +101,7 @@ @prefix skos: . @prefix owl: . - + <###h#ttp://purl.org/poi/corpusdelaparole.huma-num.fr/crdo-CFPP2000_35_SOUND> a ore:Aggregation ; edm:aggregatedCHO ; edm:provider "Corpus de la Parole"@fr ; @@ -141,13 +141,13 @@ ] . - a edm:WebResources ; + a edm:WebResource ; dc11:format "application/xml"^^dc:IMT ; dc:created "2010-11-17"^^dc:W3CDTF ; dc:issued "2013-11-04T22:20:07+01:00"^^dc:W3CDTF . - a edm:WebResources ; + a edm:WebResource ; dc11:format "application/xhtml+xml"^^dc:IMT ; dc:created "2010-11-17"^^dc:W3CDTF ; dc:issued "2013-11-04T22:20:07+01:00"^^dc:W3CDTF . @@ -249,7 +249,7 @@ * @return void */ public function testWebResources() { - $webResList = $this->resGraph->allOfType('http://www.europeana.eu/schemas/edm/WebResources'); + $webResList = $this->resGraph->allOfType('http://www.europeana.eu/schemas/edm/WebResource'); $this->assertCount(5, $webResList, "Must have 5 webResource"); }