From 9dbe4c55a67024e2c8510e24133ebd10681f269d Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 20 Nov 2018 17:23:14 +0100
Subject: [PATCH] hotline#81316 fix RT
---
.../NoticeIntegrationSerialArticlesTest.php | 6 ++++++
library/Class/Notice.php | 19 +------------------
2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php b/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php
index ddfebe9e11e..085b8652084 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 deae2dbe12a..a471e638417 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]) : '';
--
GitLab