diff --git a/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php b/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php index ddfebe9e11e30f4159e4d4989c9ccb34ce46b7c5..085b865208444cb2fe22f25f102ffce17d38ba4c 100644 --- a/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php +++ b/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php @@ -73,6 +73,12 @@ abstract class NoticeIntegrationSerialArticlesTestCase extends ModelTestCase { } + public function tearDown() { + Zend_Registry::set('sql', null); + parent::tearDown(); + } + + protected function _runTraiteNotice() { $integration = new notice_integration; $integration->setParamsIntegration(36, diff --git a/library/Class/Notice.php b/library/Class/Notice.php index deae2dbe12ae5df04149ddfaecea748d3af6eff1..a471e638417fc72d88bc8400b51e0b50c58af6a2 100644 --- a/library/Class/Notice.php +++ b/library/Class/Notice.php @@ -611,19 +611,6 @@ class Class_Notice extends Storm_Model_Abstract { return $data; } - protected function existsInArray($array,$field,$value) { - if (!$value || $value == '') - return false; - foreach ($array as $model) { - if (!isset($model[$field])) - continue; - if ($model[$field] == $value) - return true; - } - return false; - } - - // ---------------------------------------------------------------- // Renvoie les articles d'un périodique // ---------------------------------------------------------------- @@ -642,15 +629,11 @@ class Class_Notice extends Storm_Model_Abstract { $serial_article->getNoticeUnimarc()->setNotice($enreg->getUnimarc(), 0); $article = ["titre" => $serial_article->getTitrePrincipal()]; - if ($complement = $serial_article->getComplementTitre()) $article["titre"] .= " : " . $complement; - if ($this->existsInArray($articles,'clef_unimarc',$enreg->getClefUnimarc())) - continue; - $auteurs = $serial_article->getAuteursUnimarc(true); + $auteurs = $serial_article->getAuteursUnimarc(true); $article["auteur"] = isset($auteurs[0]) ? $auteurs[0] : ''; - $article["clef_unimarc"] = $enreg->getClefUnimarc(); $article["pagination"] = $serial_article->getCollation(); $note = $data = $serial_article->get_subfield("300", "a"); $article["note"] = isset($note[0]) ? trim($note[0]) : '';