Merge branch 'hotline#14919_album_annee_edition' into 'hotline_6.48'

Hotline#14919 Album Annee Edition

VERSIONS

+- ticket #14919: Indexation des albums bibliothèque numérique: si l'année d'édition n'est pas saisie, ne mets plus l'année de mise à jour par défaut dans la notice
+
 21/08/2014 - v6.48.0
 
 - ticket #13881: intégration de la ressource numérique LeKiosk

library/Class/Indexation/PseudoNotice.php

@@ -168,7 +168,7 @@ class Class_Indexation_PseudoNotice {
 			->setAuteurs($this->_indexation->getfullText($authors))
 			->setAlphaAuteur($this->_indexation->alphaMaj(implode(' ', $authors)))
 			->setFacettes(implode(' ',$this->_getFacettes()))
-			->setAnnee(($this->_datas["annee"]) ? $this->_datas["annee"]: substr($this->_datas["date_maj"],0,4))
+			->setAnnee($this->_datas["annee"])
 			->setQualite(3) // Qualite = pseudo_notice
 			->setExportable("1")
 			->setUnimarc($unimarc)

tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php

@@ -237,6 +237,12 @@ class RechercheControllerAlbumAudioRecordViewNoticeTest extends RechercheControl
 																	 'code_rebond' => 'A1']],
 												$imaiden);
 	}
+
+
+	/** @test */
+	public function anneeShouldBeEmpty() {
+		$this->assertEquals('', $this->_notice->getAnnee());
+	}
 }
 
 

tests/library/Class/Indexation/PseudoNoticeTest.php

@@ -32,9 +32,10 @@ class Class_Indexation_PseudoNoticeAlbumTest extends Class_Indexation_PseudoNoti
 		parent::setUp();
 		$this->fixture('Class_Album', 
 									 ['id' => 896,
-										'fichier' => '123_file.png',
-										'notes' => 'a:3:{i:1;a:2:{s:5:"field";s:3:"856";s:4:"data";a:2:{s:1:"x";s:12:"external_uri";s:1:"a";N;}}s:5:"215$a";s:0:"";i:2;a:2:{s:5:"field";s:3:"701";s:4:"data";a:2:{s:1:"a";s:16:"Gustave Flaubert";i:4;s:0:"";}}}',
-										'id_origine' => '778997987'])
+									 'fichier' => '123_file.png',
+									 'notes' => 'a:3:{i:1;a:2:{s:5:"field";s:3:"856";s:4:"data";a:2:{s:1:"x";s:12:"external_uri";s:1:"a";N;}}s:5:"215$a";s:0:"";i:2;a:2:{s:5:"field";s:3:"701";s:4:"data";a:2:{s:1:"a";s:16:"Gustave Flaubert";i:4;s:0:"";}}}',
+									 'id_origine' => '778997987',
+									 'annee' => 2012])
 			->index();
 		$this->_notice = Class_Notice::find(1);
 	}
@@ -46,6 +47,12 @@ class Class_Indexation_PseudoNoticeAlbumTest extends Class_Indexation_PseudoNoti
 	}
 
 
+	/** @test */
+	public function anneeShouldBe2012() {
+		$this->assertEquals(2012, $this->_notice->getAnnee());
+	}
+
+
 	/** @test */
 	public function noticeShouldNotHave856b() {
 		$this->assertEmpty($this->_notice->get_subfield('856', 'b'));