diff --git a/VERSIONS_HOTLINE/81316 b/VERSIONS_HOTLINE/81316
new file mode 100644
index 0000000000000000000000000000000000000000..83a49deeaf1e4389e5fa47dbd800eb708148c88a
--- /dev/null
+++ b/VERSIONS_HOTLINE/81316
@@ -0,0 +1,2 @@
+ - ticket #81316 : Intégration Cosmogramme : amélioration du dédoublonnage des périodiques.
+
\ No newline at end of file
diff --git a/cosmogramme/php/classes/classe_notice_integration.php b/cosmogramme/php/classes/classe_notice_integration.php
index f3df44dde5ec41de872dfb9fcc806c3056f8d37e..7cee1bb1aab0d3b981726f8bf7ee843dc431c549 100644
--- a/cosmogramme/php/classes/classe_notice_integration.php
+++ b/cosmogramme/php/classes/classe_notice_integration.php
@@ -168,7 +168,7 @@ class notice_integration {
$this->notice=$this->analyseur->getNoticeIntegration();
- if($this->notice['type_doc'] == Class_TypeDoc::LIVRE_NUM) {
+ if($this->notice['type_doc'] == Class_TypeDoc::SERIAL_ARTICLE) {
$this->ecrireArticlePeriodique();
return;
}
@@ -228,15 +228,12 @@ class notice_integration {
continue;
}
- $existe = $sql->fetchOne("select count(*) from notices_articles where clef_unimarc='$clef_unimarc'");
- if($existe){
- unset($enreg["clef_unimarc"]);
- $sql->update("update notices_articles set @SET@ where clef_unimarc='$clef_unimarc'",$enreg);
- }
- else {
- $enreg["clef_unimarc"]=$clef_unimarc;
- $sql->insert("notices_articles",$enreg);
- }
+ $instance = new Class_Entity(['UnimarcKey' => $clef_unimarc,
+ 'NameKey' => $this->notice['articles_periodiques']['clef_chapeau'],
+ 'NumberKey' => $this->notice['articles_periodiques']['clef_numero'],
+ 'Updated' => dateDuJour(0),
+ 'Quality' => $this->qualite_bib]);
+ Class_Notice_SerialArticles::updateOrInsert($instance);
}
}
}
@@ -929,42 +926,25 @@ class notice_integration {
}
-// --------------------------------------------------------------------------------
-// Ecrit une notice : article de périodique
-// --------------------------------------------------------------------------------
- private function ecrireArticlePeriodique() {
+ protected function ecrireArticlePeriodique() {
if( 1 == $this->notice["statut"])
return $this->deleteRecordArticles();
- $title_key = hash('crc32b', $this->notice['titre_princ']);
-
- $unimarc_key = $this->notice["clef_unimarc"]
- ? $this->notice["clef_unimarc"]
- : $title_key;
-
- $article_from_record = Class_Notice_SerialArticles::newInstance(['clef_chapeau' => $this->notice["clef_chapeau"],
- 'clef_numero' => $this->notice["clef_numero"],
- 'clef_unimarc' => $unimarc_key,
- 'unimarc' => $this->notice['unimarc'],
- 'date_maj' => dateDuJour(0),
- 'qualite' => $this->qualite_bib,
- 'clef_article' => $this->notice['clef_article']]);
-
- if(!$this->notice['clef_unimarc']) {
- $common_attribs = ['clef_chapeau' => $this->notice['clef_chapeau'],
- 'clef_numero' => $this->notice['clef_numero']];
-
- if(!$article = Class_Notice_SerialArticles::findFirstBy(array_merge($common_attribs, ['clef_unimarc' => $title_key])))
- $article = Class_Notice_SerialArticles::findFirstBy(array_merge($common_attribs, ['clef_article' => $this->notice['clef_article'],
- 'clef_unimarc' => '']));
- return $this->updateOrInsertArticle($article, $article_from_record);
- }
-
- if ($article = Class_Notice_SerialArticles::findFirstBy(['clef_unimarc' => $this->notice['clef_unimarc']])) {
- $article_from_record->setClefChapeau($article->getClefChapeau());
- $article_from_record->setClefNumero($article->getClefNumero());
- return $this->updateOrInsertArticle($article, $article_from_record);
- }
+ $instance = new Class_Entity(['Title' => $this->notice['titre_princ'],
+ 'NameKey' => $this->notice['clef_chapeau'],
+ 'NumberKey' => $this->notice['clef_numero'],
+ 'ArticleKey' => $this->notice['clef_article'],
+ 'UnimarcKey' => $this->notice['clef_unimarc'],
+ 'Unimarc' => $this->notice['unimarc'],
+ 'Updated' => dateDuJour(0),
+ 'Quality' => $this->qualite_bib]);
+
+ if (null === ($serial = Class_Notice_SerialArticles::updateOrInsert($instance)))
+ return $this->statut = static::RECORD_REJECT;
+
+ $this->statut = $serial
+ ? static::RECORD_INSERT
+ : static::RECORD_RENEW;
}
diff --git a/cosmogramme/php/classes/classe_profil_donnees.php b/cosmogramme/php/classes/classe_profil_donnees.php
index 43ff6754cdd766eeb768b595c49c5b0b3a7e3962..e5beeeb933cb2812b3c19bf9300fc98421272880 100644
--- a/cosmogramme/php/classes/classe_profil_donnees.php
+++ b/cosmogramme/php/classes/classe_profil_donnees.php
@@ -216,7 +216,7 @@ class profil_donnees {
return ['code' => 2, 'libelle' => 'Périodiques'];
if ($this->isArticlePeriodique($label))
- return ['code' => 100, 'libelle' => 'Article de périodique'];
+ return ['code' => Class_TypeDoc::SERIAL_ARTICLE, 'libelle' => 'Article de périodique'];
// First we check 995$r subfield.
foreach($this->attributs[0]["type_doc"] as $td) {
diff --git a/cosmogramme/php/classes/classe_unimarc.php b/cosmogramme/php/classes/classe_unimarc.php
index acc28bbf3b999099f7f0a81948d60ad8115122b1..4915b3929f509bd0218895e15c8ad3d117e31c1b 100644
--- a/cosmogramme/php/classes/classe_unimarc.php
+++ b/cosmogramme/php/classes/classe_unimarc.php
@@ -116,7 +116,7 @@ class notice_unimarc extends iso2709_record {
public function getNoticeIntegration() {
$type_doc = $this->getTypeDocAsArray();
- if ($type_doc['code'] == 100)
+ if ($type_doc['code'] == Class_TypeDoc::SERIAL_ARTICLE)
return $this->getNoticeIntegrationArticlePeriodique();
if ($type_doc['code'] == 2)
@@ -237,8 +237,8 @@ class notice_unimarc extends iso2709_record {
public function getNoticeIntegrationArticlePeriodique()
{
// type de doc
- $notice["type_doc"] = 100;
- $notice["infos_type_doc"] = ["code"=>100, 'libelle'=>"article de périodique"];
+ $notice["type_doc"] = Class_TypeDoc::SERIAL_ARTICLE;
+ $notice["infos_type_doc"] = ["code"=> Class_TypeDoc::SERIAL_ARTICLE, 'libelle'=>"article de périodique"];
// statut
$notice["statut"] = $this->getStatut();
diff --git a/cosmogramme/sql/patch/patch_359.php b/cosmogramme/sql/patch/patch_359.php
new file mode 100644
index 0000000000000000000000000000000000000000..c0965a34e838b6ab6cd73ab2cb40e38121632210
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_359.php
@@ -0,0 +1,2 @@
+<?php
+(new Class_Migration_CleanSerialArticles())->run();
\ No newline at end of file
diff --git a/cosmogramme/tests/php/classes/NoticeIntegrationAloesTest.php b/cosmogramme/tests/php/classes/NoticeIntegrationAloesTest.php
index 43a11935a2a6254d77290a92434e9c7ccf761a17..9acd648e55fb0d34b9c8ad985f48e9a05004c155 100644
--- a/cosmogramme/tests/php/classes/NoticeIntegrationAloesTest.php
+++ b/cosmogramme/tests/php/classes/NoticeIntegrationAloesTest.php
@@ -198,10 +198,13 @@ class NoticeIntegrationAloesSerialIndexpressBellesHistoireTest extends NoticeInt
}
- /** @test */
- public function noArticleShouldHaveBeenSaved() {
- $this->assertCount(0, Class_Notice_SerialArticles::findAll());
- }
+ /**
+ * @test
+ * hotline#81316 Before fix save was made by sql registry and wasn't mocked. *
+ * Now storm save it so we found serial. **/
+ public function articleShouldHaveBeenSaved() {
+ $this->assertCount(1, Class_Notice_SerialArticles::findAll());
+ }
}
diff --git a/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php b/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..085b865208444cb2fe22f25f102ffce17d38ba4c
--- /dev/null
+++ b/cosmogramme/tests/php/classes/NoticeIntegrationSerialArticlesTest.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+require_once 'classe_notice_integration.php';
+require_once 'ModelTestCase.php';
+
+
+/** hotline #81316 **/
+abstract class NoticeIntegrationSerialArticlesTestCase extends ModelTestCase {
+
+ protected $_storm_default_to_volatile = true;
+
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->fixture('Class_IntBib',
+ ['id' => 36,
+ 'libelle' => 'Ma biliothèque',
+ 'qualite' => 4
+ ]);
+
+ $bib = $this->fixture('Class_Bib',
+ ['id_site' => 36,
+ 'libelle' => 'Ma biliothèque',
+ 'ville' => 'Annecy',
+ 'visibilite' => Class_Bib::V_DATA]);
+
+ $int_profil =
+ $this->fixture('Class_IntProfilDonnees',
+ ['id' => 812,
+ 'libelle' => 'notices',
+ 'accents' => Class_IntProfilDonnees::ENCODING_ISO2709,
+ 'rejet_periodiques' => 1,
+ 'id_article_periodique' => 2,
+ 'type_fichier' => Class_IntProfilDonnees::FT_RECORDS,
+ 'format' => Class_IntProfilDonnees::FORMAT_UNIMARC,
+ 'attributs' => [
+ [Class_IntProfilDonnees::PROFILE_DOC_TYPES => [['code' => '2',
+ 'label' => 'as',
+ 'zone_995' => 'REV;']],
+ Class_IntProfilDonnees::FIELD_ITEM_BARCODE => 'f',
+ Class_IntProfilDonnees::FIELD_ITEM_COTE => 'k',
+ Class_IntProfilDonnees::FIELD_ITEM_TYPE_DOC => 'r',
+ Class_IntProfilDonnees::FIELD_ITEM_GENRE => '',
+ Class_IntProfilDonnees::FIELD_ITEM_SECTION => 'q',
+ Class_IntProfilDonnees::FIELD_ITEM_EMPLACEMENT => 'u',
+ Class_IntProfilDonnees::FIELD_ITEM_ANNEXE => 'a'],
+ ['zone' => '995',
+ 'champ' => 'n',
+ 'format' => Class_IntProfilDonnees::NOVELTY_DATE_FORMAT_VALUES,
+ 'jours' => '0',
+ 'valeurs' => 'nouveaute']
+ ]]);
+ }
+
+
+ public function tearDown() {
+ Zend_Registry::set('sql', null);
+ parent::tearDown();
+ }
+
+
+ protected function _runTraiteNotice() {
+ $integration = new notice_integration;
+ $integration->setParamsIntegration(36,
+ Class_Cosmogramme_Integration::TYPE_OPERATION_INCREMENT,
+ 812);
+
+ $integration->traiteNotice(file_get_contents(__DIR__ . '/unimarc_serial_article.txt'));
+ $integration->traiteNotice(file_get_contents(__DIR__ . '/unimarc_serial_article_l_etudiant.txt'));
+ $integration->traiteNotice(file_get_contents(__DIR__ . '/unimarc_serial_article_l_etudiant.txt'));
+ }
+}
+
+
+
+
+class NoticeIntegrationSerialArticlesTraiteNoticeTest extends NoticeIntegrationSerialArticlesTestCase {
+
+ protected $_serial;
+
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->_runTraiteNotice();
+ $this->_serial = Class_Notice_SerialArticles::findFirstBy(['clef_unimarc' => 3254100]);
+ }
+
+
+ /** @test */
+ public function fifteenSerialArticleShouldExists() {
+ $this->assertEquals(15, count(Class_Notice_SerialArticles::findAllBy([])));
+ }
+
+
+ /** @test */
+ public function clefChapeauShouldBeLEtudiant() {
+ $this->assertEquals('L ETUDIANT', $this->_serial->getClefChapeau());
+ }
+
+
+ /** @test */
+ public function clefNumeroShouldBe425() {
+ $this->assertEquals('425', $this->_serial->getClefNumero());
+ }
+
+
+ /** @test */
+ public function clefUnimarcShouldBe3254100() {
+ $this->assertEquals('3254100', $this->_serial->getClefUnimarc());
+ }
+
+
+ /** @test */
+ public function clefArticleShouldBePublicOuPrive() {
+ $this->assertEquals('PUBLIC OU PRIVE QUE', $this->_serial->getClefArticle());
+ }
+
+
+ /** @test */
+ public function unimarcShouldBeSet() {
+ $this->assertNotNull($this->_serial->getUnimarc());
+ }
+
+
+ /** @test */
+ public function dataMajShouldBeSet() {
+ $this->assertNotNull($this->_serial->getDateMaj());
+ }
+
+
+ /** @test */
+ public function qualiteShouldBe4() {
+ $this->assertEquals('4', $this->_serial->getQualite());
+ }
+}
+
+
+
+
+class NoticeIntegrationSerialArticlesCleanTest extends NoticeIntegrationSerialArticlesTestCase {
+
+
+ public function setUp() {
+ parent::setUp();
+
+ $duplicated_columns = ['clef_chapeau' => 'L ETUDIANT',
+ 'clef_numero' => 425,
+ 'clef_article' => 'PUBLIC OU PRIVE QUE',
+ 'clef_unimarc' => '3254100',
+ 'unimarc' => '',
+ 'date_maj' => '2018-11-20',
+ 'qualite' => 4];
+
+ $this->fixture('Class_Notice_SerialArticles',
+ array_merge(['id' => 2],
+ $duplicated_columns));
+
+ $this->fixture('Class_Notice_SerialArticles',
+ array_merge(['id' => 3],
+ $duplicated_columns));
+
+ $this->fixture('Class_Notice_SerialArticles',
+ array_merge(['id' => 4],
+ $duplicated_columns));
+
+ $this->fixture('Class_Notice_SerialArticles',
+ array_merge(['id' => 5],
+ $duplicated_columns));
+
+ Zend_Registry::set('sql', $this->mock()
+
+ ->whenCalled('fetchAll')
+ ->with('select distinct clef_unimarc, count(*) from notices_articles group by clef_unimarc having count(clef_unimarc) > 1')
+ ->answers([['clef_unimarc' => 3254100,
+ 'count' => 56]])
+
+ ->whenCalled('fetchAll')
+ ->with('select id_article from notices_articles where clef_unimarc = "3254100" order by qualite, date_maj')
+ ->answers([['id_article' => 2],
+ ['id_article' => 3],
+ ['id_article' => 4],
+ ['id_article' => 5]])
+
+ ->whenCalled('query')
+ ->with('delete from notices_articles where id_article in (2,3,4)')
+ ->willDo(function()
+ {
+ Class_Notice_SerialArticles::deleteBy(['id_article' =>
+ [2,3,4]]);
+ })
+ );
+
+ $this->_runTraiteNotice();
+ (new Class_Migration_CleanSerialArticles)->run();
+ }
+
+
+ /** @test */
+ public function fifteenSerialArticlesShouldExists() {
+ $this->assertEquals(15, count(Class_Notice_SerialArticles::findAllBy([])));
+ }
+}
\ No newline at end of file
diff --git a/cosmogramme/tests/php/classes/unimarc_serial_article.txt b/cosmogramme/tests/php/classes/unimarc_serial_article.txt
new file mode 100644
index 0000000000000000000000000000000000000000..32f3991dcbbf722e312d291ff736710cdf524d80
--- /dev/null
+++ b/cosmogramme/tests/php/classes/unimarc_serial_article.txt
@@ -0,0 +1 @@
+01517nas0 2200265 450 001000800000100004100008200002600049210000900075461002900084462007600113462011200189462006600301462005600367462010500423462007000528462009800598462005400696462005200750462008100802462006300883462008300946462008101029462006801110462007301178 3252432 a20180210a2018 uu y0frey0103 ba aL'Etudiant iMars 2018 d2018 | 30126040 tL'Etudiant v425 33254100 tPublic ou privé, quel lycée pour vous ? fCatherine de Coppet 33254102 tDominique Saibron, Boulanger-pâtissier : "Je vendais mes brioches dans ma cité" fNathalie Hélal 33254103 tExcellence à la française (L') fDelphine Dauvergne 33254106 tJe n'ai pas beaucoup d'amis fMaria Poblete 33254107 tMa vie dans une école de la deuxième chance. "Chacun avance à son rythme" fMaria Poblete 33254108 tBachelors : ces bac + 3 qui ont la cote fCécile Peltier 33254109 tAdmissions parallèles. Une grande école sans passer par la prépa fCécile Peltier 33254110 tMots de la métaphore (Les) fEric Cobast 33254111 tDevenez un crack en maths fAssia Hamdi 33254113 tEtudier en Nouvelle-Aquitaine. Le goût du Sud-Ouest fMartin Rhodes 33254114 tGardiens de dame Nature (Les) fVirginie Bertereau 33254116 tObjectif postbac. Vers le commerce ou la santé ? fClothilde Hanoteau 33254117 tUn Français en... Suisse. Olivier à Lausanne fJean-Marc Engelhard 33254121 tComment je suis devenu maraîcher bio fNathalie Hélal 33254123 tPalmarès 2018 des écoles d'arts appliqués fMartin Rhodes
\ No newline at end of file
diff --git a/cosmogramme/tests/php/classes/unimarc_serial_article_l_etudiant.txt b/cosmogramme/tests/php/classes/unimarc_serial_article_l_etudiant.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9fa6fda4f921b4aef83060a63e083c1732047c7f
--- /dev/null
+++ b/cosmogramme/tests/php/classes/unimarc_serial_article_l_etudiant.txt
@@ -0,0 +1 @@
+01484naa0 2200181 450 001000800000100004100008200008200049215001300131307000600144330082300150606003800973606006001011606007801071606003401149606005501183700003401238801003001272 3254100 a20180209d2018 uu|y0frey0103 ba 1 aPublic ou privé, quel lycée pour vous ? b[périodique] fCatherine de Coppet app.12-16 a5 aC'est un débat qui agite souvent les familles à la fin de la classe de troisième : aller dans un lycée public ou dans un lycée privé ? La France compte à peine plus de lycées publics que de lycées privés, tous types d'établissements confondus (généraux, technologiques et professionnels), alors que cet écart est beaucoup plus important, en faveur du public, au niveau élémentaire ou au collège. Même si jusqu'à la troisième, vous avez passé toute votre scolarité dans le public, la question pourra donc se poser pour vous d'intégrer un lycée privé à un moment de votre parcours. Mais comment vous décider ? Au-delà des clichés persistants, qui collent à la peau du public comme du privé, "l'Etudiant" a recueilli les témoignages de lycéens pour vous aider à choisir. Suivez le guide. | 32303668 aLycées 32557578 xTarifs | 32301864 aEcoles privées 32419532 xProgrammes d'études | 33254101 aEtablissements publics locaux d'enseignement 32518476 xAdmission | 31115046 aOrientation scolaire | 32511231 aElèves du secondaire 31057652 xEnquêtes | 33204968 aCoppet bCatherine de 0 aFR bIndexpresse c20180209
diff --git a/library/Class/Migration/CleanSerialArticles.php b/library/Class/Migration/CleanSerialArticles.php
new file mode 100644
index 0000000000000000000000000000000000000000..f49d019e5ab8653e98f8b4ab456303fcb79f2d64
--- /dev/null
+++ b/library/Class/Migration/CleanSerialArticles.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright (c) 2012-2017, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * BOKEH is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+ * the Free Software Foundation.
+ *
+ * There are special exceptions to the terms and conditions of the AGPL as it
+ * is applied to this software (see README file).
+ *
+ * BOKEH is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * along with BOKEH; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+class Class_Migration_CleanSerialArticles {
+ protected $_sql;
+
+
+ public function __construct() {
+ $this->_sql = Zend_Registry::get('sql');
+ }
+
+
+ public function run() {
+ $unimarc_keys = $this->_sql->fetchAll('select distinct clef_unimarc, count(*) from notices_articles group by clef_unimarc having count(clef_unimarc) > 1');
+
+ foreach ($unimarc_keys as $result)
+ $this->_cleanBy($result['clef_unimarc']);
+
+ return $this;
+ }
+
+
+ protected function _cleanBy($unimarc_key) {
+ $ids = $this->_sql->fetchAll(sprintf('select id_article from notices_articles where clef_unimarc = "%s" order by qualite, date_maj',
+ $unimarc_key ));
+
+ $keep = array_pop($ids);
+
+ $ids_to_delete = [];
+
+ foreach($ids as $result)
+ $ids_to_delete [] = $result['id_article'];
+
+ if (!empty($ids_to_delete))
+ $this->_sql->query(sprintf('delete from notices_articles where id_article in (%s)',
+ implode(',', $ids_to_delete)));
+ }
+}
\ No newline at end of file
diff --git a/library/Class/Notice/SerialArticles.php b/library/Class/Notice/SerialArticles.php
index 5cd0e94a70950a98c39f90bea5f96b4dbacfbb16..48e4fcd502441203f108a20bec9236cf2164dea3 100644
--- a/library/Class/Notice/SerialArticles.php
+++ b/library/Class/Notice/SerialArticles.php
@@ -19,8 +19,58 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+class NoticeSerialArticlesLoader extends Storm_Model_Loader {
+ public function updateOrInsert($instance) {
+ $serial = ($serial = Class_Notice_SerialArticles::findWith($instance))
+ ? $serial
+ : Class_Notice_SerialArticles::newInstance(['qualite' => $instance->getQuality()]);
+
+ if ($serial->getQualite() > $instance->getQuality())
+ return;
+
+ $update_columns = array_filter(['clef_chapeau' => $instance->getNameKey(),
+ 'clef_numero' => $instance->getNumberKey(),
+ 'clef_article' => $instance->getArticleKey(),
+ 'clef_unimarc' => $this->_forgeUnimarcKey($instance),
+ 'unimarc' => $instance->getUnimarc(),
+ 'date_maj' => $instance->getUpdated(),
+ 'qualite' => $instance->getQuality()]);
+
+ $serial->updateAttributes($update_columns);
+ $is_new = $serial->isNew();
+ $serial->save();
+ return $is_new;
+ }
+
+
+ public function findWith($instance) {
+ if ($unimarc_key = $instance->getUnimarcKey())
+ return Class_Notice_SerialArticles::findFirstBy(['clef_unimarc' => $unimarc_key]);
+
+ if($article = Class_Notice_SerialArticles::findFirstBy(['clef_chapeau' => $instance->getNameKey(),
+ 'clef_numero' => $instance->getNumberKey(),
+ 'clef_unimarc' => $this->_forgeUnimarcKey($instance)]))
+ return $article;
+
+ return Class_Notice_SerialArticles::findFirstBy(['clef_chapeau' => $instance->getNameKey(),
+ 'clef_numero' => $instance->getNumberKey(),
+ 'clef_article' => $instance->getArticleKey(),
+ 'clef_unimarc' => '']);
+ }
+
+
+ protected function _forgeUnimarcKey($instance) {
+ return $instance->getUnimarcKey()
+ ? $instance->getUnimarcKey()
+ : hash('crc32b', $instance->getTitle());
+ }
+}
+
+
+
class Class_Notice_SerialArticles extends Storm_Model_Abstract {
protected
+ $_loader_class = 'NoticeSerialArticlesLoader',
$_table_name = 'notices_articles',
$_table_primary = 'id_article';
@@ -28,7 +78,10 @@ class Class_Notice_SerialArticles extends Storm_Model_Abstract {
protected $_default_attribute_values = ['clef_chapeau' => '',
'clef_numero' => '',
'clef_article' => '',
- 'unimarc' => ''];
+ 'clef_unimarc' => '',
+ 'unimarc' => '',
+ 'qualite' => '',
+ 'date_maj' => ''];
public function validate() {
@@ -38,6 +91,4 @@ class Class_Notice_SerialArticles extends Storm_Model_Abstract {
if (!$this->getClefNumero())
$this->addError('Clé numero requise');
}
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/library/Class/TypeDoc.php b/library/Class/TypeDoc.php
index c78e159c9b2db770fc12b928c74f62112a71eba7..243e3bcc36b76f3603af5747fbab235ecb9a1f21 100644
--- a/library/Class/TypeDoc.php
+++ b/library/Class/TypeDoc.php
@@ -308,6 +308,7 @@ class Class_TypeDoc extends Storm_Model_Abstract {
const ARTICLE = 8;
const RSS = 9;
const SITE = 10;
+ const SERIAL_ARTICLE = 100;
const LIVRE_NUM = 100;
const DIAPORAMA = 101;
const EPUB = 102;
diff --git a/tests/db/UpgradeDBTest.php b/tests/db/UpgradeDBTest.php
index b16529eb9ed7edc2f1a60440e9079a6806b0e71e..4feac4dfe60a5bf16643197223ab4113f3dbe589 100644
--- a/tests/db/UpgradeDBTest.php
+++ b/tests/db/UpgradeDBTest.php
@@ -2371,4 +2371,14 @@ class UpgradeDB_358_Test extends UpgradeDBTestCase {
public function itemTypeShouldBeIndexed() {
$this->assertIndex('exemplaires', 'type');
}
-}
\ No newline at end of file
+}
+
+
+
+
+class UpgradeDB_359_Test extends UpgradeDBTestCase {
+ public function prepare() {}
+
+ /** @test */
+ public function placeholderForSerialArticleMigration() {}
+}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTest.php
index 21215f0a43d249dd9278e8399a1b5fa7efe0e23d..2808f39cb81938108f54d2e314863f6688f92773 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTest.php
@@ -184,6 +184,10 @@ class PhaseNoticeImportFullTest extends PhaseNoticeImportTestCase {
$this->assertEquals(110, $this->_phase->getCount(Class_Cosmogramme_Integration_Phase::RECORD_INSERT));
}
+ /** @test */
+ public function phaseCounterShouldNotContainsRecordsRenew() {
+ $this->assertEquals(0, $this->_phase->getCount(Class_Cosmogramme_Integration_Phase::RECORD_RENEW));
+ }
/** @test */
public function phaseCounterShouldContain17RecordsRejected() {