diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php
index c797b3d3ea6da4d4e16050a78b3fa5b69b1164c6..fc74006f256bf4169ad6f0b2aeec59d2a2a8c5e4 100644
--- a/application/modules/opac/controllers/AuthController.php
+++ b/application/modules/opac/controllers/AuthController.php
@@ -378,6 +378,4 @@ class Auth_Strategy_Cas_NotLogged extends Auth_Strategy_Cas_Abstract{
$this->redirect_url=$this->urlServiceCas();
}
-
-
}
\ No newline at end of file
diff --git a/library/Class/Album.php b/library/Class/Album.php
index 46cff20534ce76bb1bc0869974a5adf91da9750f..c36567e72fe1e97775150165ee201c8b05e9bca0 100644
--- a/library/Class/Album.php
+++ b/library/Class/Album.php
@@ -958,8 +958,9 @@ class Class_Album extends Storm_Model_Abstract {
public function getNotesAsArray() {
+
if (!$notes = unserialize($this->getNotes()))
- return array();
+ return [];
return $notes;
}
@@ -1226,9 +1227,13 @@ class Class_Album extends Storm_Model_Abstract {
public function addURIInNotes($type, $uri) {
+ return $this->addZone('856', ['x' => $type, 'a' => $uri]);
+ }
+
+ public function addZone($zone, $sous_zones) {
$notes = $this->getNotesAsArray();
- $notes [] = ['field' => '856',
- 'data' => array('x' => $type, 'a' => $uri)];
+ $notes [] = ['field' => $zone,
+ 'data' => $sous_zones];
return $this->setNotes($notes);
}
diff --git a/library/Class/WebService/BibNumerique/ArteVOD/FilmReader.php b/library/Class/WebService/BibNumerique/ArteVOD/FilmReader.php
index 45c33f43ae9f9cf83a1a877f6004669388a0053b..0e5356fe2189e3e3e82dcc068f1e6e8a30999b0a 100644
--- a/library/Class/WebService/BibNumerique/ArteVOD/FilmReader.php
+++ b/library/Class/WebService/BibNumerique/ArteVOD/FilmReader.php
@@ -49,7 +49,19 @@ class Class_WebService_Bibnumerique_ArteVOD_FilmReader {
$this->_film->setDescription($data);
}
+ public function endGenre($data) {
+ $this->_film->addMatiere($data);
+ }
+
+ public function endSub_genre($data) {
+ $this->_film->addMatiere($data);
+ }
+
+ public function endDuration($data) {
+ $this->_film->addZone('215',['a'=> 'Vidéo ('.$data.' min)']);
+ }
+
public function endProduction_Year($data) {
$this->_film->setYear($data);
}
diff --git a/library/Class/WebService/BibNumerique/ArteVOD/FilmsReader.php b/library/Class/WebService/BibNumerique/ArteVOD/FilmsReader.php
index e8001a51904b006dbb4287eee4ab44c463583434..71526d843904bace22448ba595289917a7ed6f01 100644
--- a/library/Class/WebService/BibNumerique/ArteVOD/FilmsReader.php
+++ b/library/Class/WebService/BibNumerique/ArteVOD/FilmsReader.php
@@ -29,7 +29,7 @@ class Class_WebService_BibNumerique_ArteVOD_FilmsReader {
public function parse($xml) {
$this->_total_count = $this->_page_number = 0;
$this->_page_size = 1;
- $this->_films = array();
+ $this->_films = [];
$this->_xml_parser = Class_WebService_XMLParser::newInstance();
$this->_xml_parser->setElementHandler($this);
diff --git a/library/Class/WebService/BibNumerique/RessourceNumerique.php b/library/Class/WebService/BibNumerique/RessourceNumerique.php
index 3f313109e3cfa30fff750347b72edf5c859bbfed..2e45f8b42a89ae6129ca64462a48b55b4a5d9dbe 100644
--- a/library/Class/WebService/BibNumerique/RessourceNumerique.php
+++ b/library/Class/WebService/BibNumerique/RessourceNumerique.php
@@ -35,6 +35,7 @@
protected $_editeur;
protected $_matieres = [];
protected $_ressources = [];
+ protected $_zones = [];
public function setId($id) {
$this->_id = $id;
@@ -177,12 +178,33 @@
public function getPhotos() {
return $this->_photos;
}
+
+
+ public function getMatieres() {
+ return implode($this->_matieres,'::');
+ }
+
+
+ public function getZone($codif) {
+ return $this->_zones[$codif];
+ }
+
+
+ public function addZone($codif,$datas) {
+ $this->_zones[$codif] = $datas;
+ }
public function addMatiere($matiere_libelle) {
$this->_matieres[] = $matiere_libelle;
}
+ public function importZones($album) {
+ foreach ($this->_zones as $zone_codif => $zone_datas) {
+ $album->addZone($zone_codif,$zone_datas);
+ }
+ }
+
public function importMatieres($album) {
$ids=[];
@@ -221,10 +243,12 @@
->setRessources($this->getRessources());
$this->importMatieres($album);
+
+
$this->fillAlbum($album);
$this->updateRessourceNumeriqueNotes($album);
-
+ $this->importZones($album);
if ($album->save())
Class_WebService_BibNumerique_Vignette::getInstance()->updateAlbum($album);
return $album;
@@ -261,7 +285,6 @@
public function updateRessourceNumeriqueNotes($ressource_numerique) {
- $notes = array();
foreach ($this->_posters as $url)
$ressource_numerique->addPosterUri($url);
diff --git a/tests/library/Class/WebService/ArteVOD/FilmReaderTest.php b/tests/library/Class/WebService/ArteVOD/FilmReaderTest.php
index 4b610f4f2e537b5472d919e521894f021247ada0..6bf7621df65f3c198aab4e5b0ae60f3bf3cb4cea 100644
--- a/tests/library/Class/WebService/ArteVOD/FilmReaderTest.php
+++ b/tests/library/Class/WebService/ArteVOD/FilmReaderTest.php
@@ -26,7 +26,7 @@ class ArteVOD_FilmReaderTest extends PHPUnit_Framework_TestCase {
$reader = new Class_WebService_BibNumerique_ArteVOD_FilmReader();
$this->_film = new Class_WebService_BibNumerique_ArteVOD_Film();
$reader->parseContentOn('<?xml version="1.0" encoding="utf-8"?><wsObjectQuery>
-<film><pk>5540</pk><externalUri>http://www.mediatheque-numerique.com/films/blanche-neige</externalUri><editorial><title>Blanche Neige</title><description>Une adaptation drôle et poétique du conte des frères Grimm, dans une collection de théâtre pour jeune public.</description><original_title></original_title><body>La pomme, les sept nains, le cercueil de verre, le prince à cheval, le miroir magique... : le metteur en scène Nicolas Liautard a parié sur les images évoquées dans le conte pour faire du théâtre sans texte. Une succession de tableaux vivants, où le langage du corps, les jeux de lumière et la scénographie créent une féerie intemporelle qui sollicite l\'imaginaire des enfants.</body><genre code="drama"><label lang="fr">Dramatique</label></genre><tags></tags></editorial><technical><duration>70</duration><target_audience code="all-1"><label lang="fr">target_audience_all_1</label></target_audience><production_year>2011</production_year><production_countries><country code="FR"><label lang="fr">France</label></country></production_countries><codes><code type="ARTE">131333</code></codes><release_dates></release_dates><languages><language code="fr"><label lang="fr">Français</label></language></languages><copyright></copyright></technical><staff><authors><person><first_name>Florent</first_name><last_name>Trochel</last_name><full_name>Florent Trochel</full_name></person></authors><actors></actors></staff><media><posters><media src="http://media.universcine.com/7e/5c/7e5c210a-b4ad-11e1-b992-959e1ee6d61d.jpg"><modificationDate>2012-06-13T11:45:26</modificationDate></media></posters><trailers><media src="http://media.universcine.com/7e/5b/7e5bece6-7d56-11e1-9d5b-6b449667e8b8.mp4"><modificationDate>2012-04-03T08:31:24</modificationDate></media></trailers><photos><media src="http://media.universcine.com/7d/f8/7df8bc21-7d56-11e1-baed-69499da4469c.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/14/7e142c4c-7d56-11e1-bef3-a980e4936291.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/19/7e199359-7d56-11e1-9d9b-a9fbcefd86db.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/1d/7e1dc11e-7d56-11e1-99aa-8775a2d902d1.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/28/7e28cbe1-7d56-11e1-a80d-d78d88d4aa56.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media></photos></media></film></wsObjectQuery>',
+<film><pk>5540</pk><externalUri>http://www.mediatheque-numerique.com/films/blanche-neige</externalUri><editorial><title>Blanche Neige</title><description>Une adaptation drôle et poétique du conte des frères Grimm, dans une collection de théâtre pour jeune public.</description><original_title></original_title><body>La pomme, les sept nains, le cercueil de verre, le prince à cheval, le miroir magique... : le metteur en scène Nicolas Liautard a parié sur les images évoquées dans le conte pour faire du théâtre sans texte. Une succession de tableaux vivants, où le langage du corps, les jeux de lumière et la scénographie créent une féerie intemporelle qui sollicite l\'imaginaire des enfants.</body><genre code="spectacle"><label lang="fr">Spectacle</label></genre><sub_genre code="theatre-danse"><label lang="fr">Théâtre, cirque et danse</label></sub_genre><tags/></editorial><technical><duration>70</duration><target_audience code="all-1"><label lang="fr">target_audience_all_1</label></target_audience><production_year>2011</production_year><production_countries><country code="FR"><label lang="fr">France</label></country></production_countries><codes><code type="ARTE">131333</code></codes><release_dates></release_dates><languages><language code="fr"><label lang="fr">Français</label></language></languages><copyright></copyright></technical><staff><authors><person><first_name>Florent</first_name><last_name>Trochel</last_name><full_name>Florent Trochel</full_name></person></authors><actors></actors></staff><media><posters><media src="http://media.universcine.com/7e/5c/7e5c210a-b4ad-11e1-b992-959e1ee6d61d.jpg"><modificationDate>2012-06-13T11:45:26</modificationDate></media></posters><trailers><media src="http://media.universcine.com/7e/5b/7e5bece6-7d56-11e1-9d5b-6b449667e8b8.mp4"><modificationDate>2012-04-03T08:31:24</modificationDate></media></trailers><photos><media src="http://media.universcine.com/7d/f8/7df8bc21-7d56-11e1-baed-69499da4469c.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/14/7e142c4c-7d56-11e1-bef3-a980e4936291.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/19/7e199359-7d56-11e1-9d9b-a9fbcefd86db.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/1d/7e1dc11e-7d56-11e1-99aa-8775a2d902d1.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media><media src="http://media.universcine.com/7e/28/7e28cbe1-7d56-11e1-a80d-d78d88d4aa56.jpg"><modificationDate>2012-04-03T08:31:03</modificationDate></media></photos></media></film></wsObjectQuery>',
$this->_film);
}
@@ -88,10 +88,23 @@ class ArteVOD_FilmReaderTest extends PHPUnit_Framework_TestCase {
$this->assertEquals(5, count($this->_film->getPhotos()));
}
-
/** @test */
public function lastPhotoShouldBeCorrect() {
$this->assertEquals('http://media.universcine.com/7e/28/7e28cbe1-7d56-11e1-a80d-d78d88d4aa56.jpg',
array_at(4, $this->_film->getPhotos()));
}
+
+ /** @test */
+ public function shouldHaveMatiereSpectacleTheatreCirqueEtDanse() {
+ $this->assertEquals('Spectacle::Théâtre, cirque et danse',$this->_film->getMatieres());
+ }
+
+
+ /** @test */
+ public function shouldHaveDuration70Min() {
+ $this->assertEquals('Vidéo (70 min)',$this->_film->getZone('215')['a']);
+ }
+
+
+
}
\ No newline at end of file
diff --git a/tests/library/Class/WebService/ArteVODTest.php b/tests/library/Class/WebService/ArteVODTest.php
index 3b3b92f80fb18ffeca00e0bb0ae3b613825e06bc..bd759e4910d38a691615ac027fc538748a143e56 100644
--- a/tests/library/Class/WebService/ArteVODTest.php
+++ b/tests/library/Class/WebService/ArteVODTest.php
@@ -111,6 +111,14 @@ class ArteVODHarverstingTwoFilmsInTwoPages extends ArteVODHarverstingTestCase {
}
+
+ /** @test */
+ public function secondAlbumZone215ShouldBe70Min() {
+ $this->assertEquals(['a' => 'Vidéo (70 min)'],
+ $this->_album_wrapper->getFirstAttributeForLastCallOn('save')->getNotesAsArray()[8]['data']);
+ }
+
+
/** @test */
public function vignetteShouldHaveBeenUploaded() {
$this->assertTrue(Class_WebService_BibNumerique_Vignette::getInstance()