diff --git a/VERSIONS_HOTLINE/172748 b/VERSIONS_HOTLINE/172748
new file mode 100644
index 0000000000000000000000000000000000000000..489e011b3bca30e91451a90efc663ad45797e442
--- /dev/null
+++ b/VERSIONS_HOTLINE/172748
@@ -0,0 +1 @@
+ - correctif #172748 : Cosmogramme : Correction d'erreurs de typage lors de l'intégration de notices de périodiques
\ No newline at end of file
diff --git a/cosmogramme/php/classes/classe_unimarc.php b/cosmogramme/php/classes/classe_unimarc.php
index 937507ada6172740ce08674bafe0a579adf914ae..cc21b83550260ef198d4815d3401ac0198b591d0 100644
--- a/cosmogramme/php/classes/classe_unimarc.php
+++ b/cosmogramme/php/classes/classe_unimarc.php
@@ -247,21 +247,23 @@ class notice_unimarc extends iso2709_record {
$notice = $this->_handleSerials($notice);
if ($notice["statut_exemplaires"]["nb_ex"] > 0) {
+ $notice["sections"]=[];
+ $notice["emplacements"]=[];
for($i=0; $i <count($notice["exemplaires"]); $i++) {
$exemplaire = $notice["exemplaires"][$i];
- if ($exemplaire["section"])
- $notice["sections"][] = $exemplaire["section"];
+ if (isset($exemplaire["section"]) && $exemplaire["section"])
+ $notice["sections"][]=$exemplaire["section"];
- if($exemplaire["emplacement"])
- $notice["emplacements"][] = $exemplaire["emplacement"];
+ if(isset($exemplaire["emplacement"]) && $exemplaire["emplacement"])
+ $notice["emplacements"][]=$exemplaire["emplacement"];
- if(isset($exemplaire["genre"]))
- $notice["genres"][] = $exemplaire["genre"];
+ if(isset($exemplaire["genre"]) && $exemplaire["genre"])
+ $notice["genres"][]=$exemplaire["genre"];
elseif (!empty($ret['genre']))
$notice["exemplaires"][$i]["genre"] = $ret["genre"][0];
- if (!$notice['cote'] && $exemplaire['cote'])
- $notice['cote'] = $exemplaire['cote'];
+ if (!$notice['cote'] && isset($exemplaire['cote']) && $exemplaire['cote'])
+ $notice['cote']=$exemplaire['cote'];
}
}
@@ -306,8 +308,13 @@ class notice_unimarc extends iso2709_record {
if (!$record_001 = $this->get_subfield('461', '9')[0])
return $notice;
- $numero = $this->get_subfield('461', 'v')[0];
- $id_head_record = $record_001 . '-' . $numero;
+ $numero='';
+ $id_head_record=$record_001;
+ if($subfield=$this->get_subfield('461', 'v')) {
+ $numero=$subfield[0];
+ $id_head_record.='-'.$numero;
+ }
+
return $this->_generateItemForSerialRecordLink($notice, $numero, $id_head_record);
}
@@ -358,7 +365,8 @@ class notice_unimarc extends iso2709_record {
protected function _generateItemForSerialRecordLink($notice, $numero, $id_head_record) {
$titre_chapeau = $this->get_subfield('461', 't')[0];
- $notice["clef_chapeau"] = $this->indexation->serialCodeAlphaChapeau($titre_chapeau, $numero);
+ $notice["clef_chapeau"] = $this->indexation->serialCodeAlphaChapeau((string) $titre_chapeau,
+ (string) $numero);
$notice['exemplaires'] = [
['code_barres' => sprintf('%s-%s',
diff --git a/library/Class/Cosmogramme/Integration/PhaseBaseRecord.php b/library/Class/Cosmogramme/Integration/PhaseBaseRecord.php
index ed7a410cd71a59c4c5fbb077ea6b7d1e1f950b87..13629dee37aecc90ab6a297c3e14603d91ef1eb4 100644
--- a/library/Class/Cosmogramme/Integration/PhaseBaseRecord.php
+++ b/library/Class/Cosmogramme/Integration/PhaseBaseRecord.php
@@ -29,10 +29,8 @@ abstract class Class_Cosmogramme_Integration_PhaseBaseRecord
/** one line of file has been read and should be processed here */
protected function _processLine($line, $integration) {
- $line->withDataDo(
- function($data) use ($integration){
- $this->importRecord($data, $integration);
- });
+ $line->withDataDo(fn($data) => $this->importRecord($data,
+ $integration));
}
diff --git a/library/Class/Indexation.php b/library/Class/Indexation.php
index d0305c28ab887ea10a2b48de903dfbcf166182cf..103e9a7fb245cff58004fc8ae39c095cd02e4fd5 100644
--- a/library/Class/Indexation.php
+++ b/library/Class/Indexation.php
@@ -151,7 +151,9 @@ class Class_Indexation {
public function serialCodeAlphaChapeau(string $titre, string $tome) : string {
- return $this->codeAlphaTitre($titre) . ' ' . $tome;
+ return $tome
+ ? $this->codeAlphaTitre($titre) . ' ' . $tome
+ : $this->codeAlphaTitre($titre);
}
diff --git a/library/ZendAfi/View/Helper/Notice/ArticlesPeriodiques.php b/library/ZendAfi/View/Helper/Notice/ArticlesPeriodiques.php
index faaf464d346031a1a2002b3c00f1716c58c95209..61b15d5b51bfbc91ee94894d9ea789a94296f35f 100644
--- a/library/ZendAfi/View/Helper/Notice/ArticlesPeriodiques.php
+++ b/library/ZendAfi/View/Helper/Notice/ArticlesPeriodiques.php
@@ -31,8 +31,10 @@ class ZendAfi_View_Helper_Notice_ArticlesPeriodiques extends ZendAfi_View_Helper
protected function _renderArticles($notice) {
- $headkey = Class_Indexation::getInstance()->serialCodeAlphaChapeau($notice->getClefChapeau(),
- $notice->getTomeAlpha());
+ $headkey = Class_Indexation::getInstance()
+ ->serialCodeAlphaChapeau((string) $notice->getClefChapeau(),
+ (string) $notice->getTomeAlpha());
+
if ($articles = Class_Notice::findAllBy(['clef_chapeau' => $headkey,
'type_doc' => Class_TypeDoc::PERIODIQUE_ARTICLE,
'order' => 'id_notice']))
diff --git a/library/templates/Intonation/Library/View/Wrapper/SerialArticle.php b/library/templates/Intonation/Library/View/Wrapper/SerialArticle.php
index f2c7a3f39bd90574c9180c20cb8d83fab30c53c7..92176f20828d0db96a098b79bcf21525522e77c2 100644
--- a/library/templates/Intonation/Library/View/Wrapper/SerialArticle.php
+++ b/library/templates/Intonation/Library/View/Wrapper/SerialArticle.php
@@ -44,8 +44,9 @@ class Intonation_Library_View_Wrapper_SerialArticle
$object->getTomeAlpha(),
$object->getCollation());
- $headkey = Class_Indexation::getInstance()->serialCodeAlphaChapeau($object->getClefChapeau(),
- $object->getTomeAlpha());
+ $headkey = Class_Indexation::getInstance()
+ ->serialCodeAlphaChapeau((string) $object->getClefChapeau(),
+ (string) $object->getTomeAlpha());
$search = Class_Url::relative(['controller' => 'recherche',
'action' => 'simple',
diff --git a/library/templates/Intonation/View/Notice/ArticlesPeriodiques.php b/library/templates/Intonation/View/Notice/ArticlesPeriodiques.php
index 63530dd2c613eabd7f990245bb0688c8be7ffeba..132ee837513a62d9623600d82b7505708a1ad5e0 100644
--- a/library/templates/Intonation/View/Notice/ArticlesPeriodiques.php
+++ b/library/templates/Intonation/View/Notice/ArticlesPeriodiques.php
@@ -56,8 +56,9 @@ class Intonation_View_Notice_ArticlesPeriodiques extends ZendAfi_View_Helper_Bas
protected function _renderArticles(Class_Notice $notice) {
$headkey =
- Class_Indexation::getInstance()->serialCodeAlphaChapeau($notice->getClefChapeau(),
- $notice->getTomeAlpha());
+ Class_Indexation::getInstance()
+ ->serialCodeAlphaChapeau((string) $notice->getClefChapeau(),
+ (string) $notice->getTomeAlpha());
$count_articles = Class_Notice::countBy(['clef_chapeau' => $headkey,
'type_doc' => Class_TypeDoc::PERIODIQUE_ARTICLE,
diff --git a/tests/application/modules/opac/controllers/MultimediaControllerTest.php b/tests/application/modules/opac/controllers/MultimediaControllerTest.php
index d94f08e6e145a6b027ffbec4be84dbf105bb10c6..92dbd353444ad56cf3ca649655c8f72f1dae5b19 100644
--- a/tests/application/modules/opac/controllers/MultimediaControllerTest.php
+++ b/tests/application/modules/opac/controllers/MultimediaControllerTest.php
@@ -525,6 +525,7 @@ class MultimediaControllerAuthenticateNanookBorrowerFromAfiMultimediaTest
'id_bib' => 5,
'type' => Class_IntBib::COM_NANOOK];
+ Class_User_ILSSubscription::setTimeSource(new TimeSourceForTest('2018-12-25 08:00:00'));
Class_WebService_SIGB_Nanook::setService($params,
Class_WebService_SIGB_Nanook_Service::newInstance()
->setServerRoot('http://localhost:8080/afi_Nanook/ilsdi/')
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeSerial.php b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeSerial.php
new file mode 100644
index 0000000000000000000000000000000000000000..2581ce4cfab5a5229dfc3dee3945dd207e9e4399
--- /dev/null
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeSerial.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright (c) 2012-2022, 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 'cosmogramme/php/fonctions/variables.php';
+require_once __DIR__ . '/PhaseNoticeTestCase.php';
+
+class PhaseNoticeSerialImportTestCase extends PhaseNoticeTestCase {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ Class_IntProfilDonnees::forKoha()
+ ->setIdProfil(103)
+ ->setTypeDocField('h')
+ ->setTypeDocRecognition(Class_TypeDoc::PERIODIQUE_ARTICLE,'aa','')
+ ->setTypeDocRecognition(Class_TypeDoc::PERIODIQUE,'','PER')
+ ->setTypeDocRecognition(Class_TypeDoc::PERIODIQUE_TITLE,'as','TP')
+ ->assertSave();
+
+ $this->fixture(Class_IntBib::class,
+ ['id' => 2,
+ 'nom_court' => 'UPEC',
+ 'sigb' => 1]);
+
+ $this->fixture(Class_Cosmogramme_Integration::class,
+ ['id' => 999,
+ 'bib' => Class_IntBib::find(2),
+ 'profil_donnees' => Class_IntProfilDonnees::find(103),
+ 'type_operation' => Class_Cosmogramme_Integration::TYPE_OPERATION_TOTAL,
+ 'traite' => 'non',
+ 'fichier' => 'unimarc_amenagement.txt',
+ 'pointeur_reprise' => 0]);
+
+ $this->_service_runner = $this->mock()
+ ->whenCalled('run')
+ ->answers(['statut' => 'KO']);
+ Class_Cosmogramme_Integration_PhaseNotice::setServiceRunner($this->_service_runner);
+ }
+
+ /** @test */
+ public function totalNumberOfRecordsShouldBe3() {
+ $this->assertEquals(3, Class_Notice::countBy([]));
+ }
+
+
+ /** @test */
+ public function totalNumberOfPeriodiqueArticlesShouldBe1() {
+ $this->assertEquals(1, Class_Notice::countBy(['type_doc' => Class_TypeDoc::PERIODIQUE_ARTICLE]));
+ }
+
+
+ /** @test */
+ public function totalNumberOfItemsShouldBe2() {
+ $this->assertEquals(2, Class_Exemplaire::countBy(['type' => Class_Notice::TYPE_BIBLIOGRAPHIC]));
+ }
+
+
+ /** @test */
+ public function newPhaseShouldBe0() {
+ $this->assertTrue($this->_phase->isId(0));
+ }
+
+
+ /** @test */
+ public function shouldNotHarvestSeeAlsos() {
+ $this->assertFalse($this->_service_runner->methodHasBeenCalled('run'));
+ }
+
+
+ /** @test */
+ public function phaseCounterShouldNotContainsRecordsRenew() {
+ $this->assertEquals(0, $this->_phase->getCount(Class_Cosmogramme_Integration_Phase::RECORD_RENEW));
+ }
+
+
+ /** @test */
+ public function phaseCounterShouldContain0RecordsRejected() {
+ $this->assertEquals(0, $this->_phase->getCount(Class_Cosmogramme_Integration_Phase::RECORD_REJECT));
+ }
+}
diff --git a/tests/library/Class/Cosmogramme/Integration/unimarc_amenagement.txt b/tests/library/Class/Cosmogramme/Integration/unimarc_amenagement.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1218121c75d880cc40d66a1a7cce18fc03fe853f
--- /dev/null
+++ b/tests/library/Class/Cosmogramme/Integration/unimarc_amenagement.txt
@@ -0,0 +1 @@
+00304naa0a2200133 4500001000500000035001600005090000900021100004100030101000800071102000700079200002000086461003600106801002800142 9483 aCHY-2037549 a9483 a20130608a|||| u y0frey5003 ba afre aFR aAnnée montagne 959020 tAménagement et montagne 1 aFR b730656101 c20130608 00531nam0a2200145 4500001000600000035001600006090001000022100004100032200005100073461004200124462003900166912001100205099002700216995014200243 59020 aCHY-0807499 a59020 a20030107a2002 uu y0frey5003 ba aAménagement et montagne hHS 1 iDécembre 2002 3CHY-0317090 tMontagne leaders 9232650 3CHY-2037549 aAnnée montagne 99483 aNA- 11 c2016-12-19 d2020-12-07 10 20 30 52002-12-01 966624 a21 bCHY-JR cCHY-JR e421 f421356 gA hPER i2016-12-19 kP 996 o2 rSURPLACE sP_996_000000000000000 w0 y2016-12-19 01299nas0 2200325 4500001000700000011001400007035001600021090001100037099002700048100004100075101000800116102000700124110001600131200006400147207002300211210008100234215001000315326002300325326002600348520009600374606006500470676003500535700004200570801003800612902005500650902003800705912001100743955005800754995016100812 232650 a1774-4547 aCHY-0317090 a232650 c2016-12-19 d2023-01-11 a19940325a2004 u||y0frey5003 ba 0 afre aFR aaha||||0|x0 1 aMontagne leaders bPériodique fDir. de publ. Michel Drapier 0 aN°180 (2004)-.... aMeylan b1, chemin du Pré carré-BP 135, 38244 cMontagne Expansion d2004-... d33 cm amensuel b2004-.... abimestriel b1975-2003 aAménagement et montagne eaménagement, économie, montagne j1975 - n°179, 2003 x0180-1597 9551326 aMontagnes xAspect économique xPériodiques 31307088 a710 vBMCHY 2.0 eCHY-JR 9605558 1 9461538 30310327 4651 aDrapier bMichel 0 aFR c19940325 gAFNOR bBM Chambéry 9628187 aRevues - Collection en cours et conservée 9628197 aRevues - Economie / Droit aNA- 11 rn°123, 1994 -> aP 996 wn°266 (2018) ; n°291 (2022) 10 20 30 52017-04-19 9416277 bCHY-JR cCHY-JR e2031 fCHY-JR18020318 gA hTP kP 996 o9 p10.00 rSURPLACE sP_996_000000000000000 w0 y2017-04-19 zEXEMPLAIRE FICTIF
\ No newline at end of file