diff --git a/VERSIONS_HOTLINE/133561 b/VERSIONS_HOTLINE/133561
new file mode 100644
index 0000000000000000000000000000000000000000..cb64a10e25aa90385077c9d53507875370fc4b88
--- /dev/null
+++ b/VERSIONS_HOTLINE/133561
@@ -0,0 +1 @@
+ - ticket #133561 : Cosmogramme : Maintenance du traitement des notices succintes
\ 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 a32346b62d5d9a28fc23707601dd62f8f85e12dc..5646cc2b901c78260341ed2e529ae783832eadde 100644
--- a/cosmogramme/php/classes/classe_notice_integration.php
+++ b/cosmogramme/php/classes/classe_notice_integration.php
@@ -313,78 +313,92 @@ class notice_integration {
}
- public function traiteSuccinte($enreg) {
- global $sql;
-
- extract($enreg);
+ /**
+ * @param $succinte Class_NoticeSuccincte
+ * @return Class_NoticeSuccincte::STATUS_*
+ */
+ public function traiteSuccinte($succinte) {
/**
* $this->id_bib is deprecated, use $this->id_int_bib instead.
* @see http://forge.afi-sa.fr/issues/14279
*/
- $this->id_bib = $this->id_int_bib = $id_bib;
- $notice = unserialize($data);
- $this->notice = $notice;
+ $this->id_bib = $this->id_int_bib = $succinte->getIdBib();
+
+ return $this->_handleSuccinteLocaly($succinte)
+ ? Class_NoticeSuccincte::STATUS_LOCAL
+ : $this->_handleSuccinteRemotely($succinte);
+ }
+
+
+ protected function _handleSuccinteLocaly($succinte) {
+ $this->notice = $data = $succinte->getDataAsArray();
+
+ if ((!$id_notice = $this->chercheNotice())
+ || (!$record = Class_Notice::find($id_notice)))
+ return false;
+
+ $this->_loadRecordForSuccinte($this->notice_sgbd,
+ $record->getUnimarc(),
+ $data);
+
+ $this->updateNotice($id_notice, $data["qualite"]);
+ $this->ecrireExemplaires($record->getId());
+
+ $succinte->delete();
+ return true;
+ }
+
+
+ protected function _handleSuccinteRemotely($succinte) {
+ $data = $succinte->getDataAsArray();
- // On la cherche dans la base
- if ($id_notice = $this->chercheNotice()) {
- $this->handleSuccinteLocaly($notice, $id_notice, $sql);
- $ret["statut"]=4;
+ $ret = $this->getServiceRunner()
+ ->getRecordZ3950(['isbn' => $data['isbn'],
+ 'ean' => $data['ean'],
+ 'id_commerciale' => $data['id_commerciale'],
+ 'no_request' => getVariable('Z3950_cache_only')]);
+
+ if (!isset($ret['statut_z3950']) || '0' === $ret['statut_z3950']) {
+ $succinte->incrementRetry()->save();
+ return Class_NoticeSuccincte::STATUS_ERROR;
}
- // On cherche sur les serveurs z3950
- else {
- $args["isbn"]=$notice["isbn"];
- $args["ean"]= $notice["ean"];
- $args["id_commerciale"]=$notice["id_commerciale"];
- $args["no_request"]=getVariable("Z3950_cache_only");
- $ret = $this->getServiceRunner()->run(4, $args);
-
- // Statut ok : on remplace la notice
- if (!$this->analyseur)
- $this->analyseur = new notice_unimarc();
-
- if ($ret["statut_z3950"] > "1") {
- $this->analyseur->ouvrirNotice($ret["unimarc"],1);
- $this->notice=$this->analyseur->getNoticeIntegration();
- $this->notice["id_origine"]=$notice["id_origine"];
- $this->notice["statut_exemplaires"] = $notice["statut_exemplaires"];
- $this->notice["exemplaires"] = $notice["exemplaires"];
- $this->notice["qualite"]=getVariable("homogene_code_qualite");
- if ($this->notice["titre_princ"]
- && $id_notice = $this->insertNotice()) {
- $this->ecrireExemplaires($id_notice);
- $ret["statut"] = 1;
- }
- $ret["statut"] = 0;
- } else {
- $ret["statut"] = 0;
- }
+ if ('1' === $ret['statut_z3950']) {
+ $succinte->incrementRetry()->save();
+ return Class_NoticeSuccincte::STATUS_NOTFOUND;
}
- // Mise a jour
- $ret["id_notice"]=$id_notice;
- $ret["id_bib"]=$id_bib;
- $ret["isbn"]=$notice["isbn"];
- $ret["ean"]= $notice["ean"];
- $ret["id_commerciale"] = $notice["id_commerciale"];
-
- $query = ($id_notice)
- ? "delete from notices_succintes where id=$id"
- : "Update notices_succintes set z3950_retry = z3950_retry +1 Where id=$id";
- $sql->execute($query);
- return $ret;
+ if (!$this->analyseur)
+ $this->analyseur = new notice_unimarc();
+
+ $this->_loadRecordForSuccinte($this->analyseur,
+ $ret['unimarc'],
+ $data,
+ getVariable('homogene_code_qualite'));
+
+ if ($this->notice["titre_princ"]
+ && ($id_notice = $this->insertNotice())) {
+ $this->ecrireExemplaires($id_notice);
+ $succinte->delete();
+
+ return Class_NoticeSuccincte::STATUS_REMOTE;
+ }
+
+ $succinte->incrementRetry()->save();
+ return Class_NoticeSuccincte::STATUS_NOTFOUND;
}
- protected function handleSuccinteLocaly($succinte, $id_notice, $sql) {
- $unimarc=$sql->fetchOne("select unimarc from notices where id_notice=$id_notice");
- $this->notice_sgbd->ouvrirNotice($unimarc,0);
- $this->notice=$this->notice_sgbd->getNoticeIntegration();
- $this->notice["id_origine"]=$succinte["id_origine"];
- $this->notice["statut_exemplaires"] = $succinte["statut_exemplaires"];
- $this->notice["exemplaires"] = $succinte["exemplaires"];
- $this->updateNotice($id_notice, $this->notice["qualite"]);
- $this->ecrireExemplaires($id_notice);
+ protected function _loadRecordForSuccinte($reader, $unimarc, $succinte_data, $quality=null) {
+ $reader->ouvrirNotice($unimarc, 1);
+ $this->notice = $reader->getNoticeIntegration();
+ $this->notice["id_origine"] = $succinte_data["id_origine"];
+ $this->notice["statut_exemplaires"] = $succinte_data["statut_exemplaires"];
+ $this->notice["exemplaires"] = $succinte_data["exemplaires"];
+ if ($quality)
+ $this->notice["qualite"] = $quality;
+
+ return $this;
}
@@ -496,8 +510,8 @@ class notice_integration {
$this->identification = ['statut' => static::STATUS_NOTFOUND];
$double_class = Class_Cosmogramme_Integration::TYPE_OPERATION_ITEM_DELETE == $this->type_operation
- ? 'Class_Notice_BarcodeDoubleFinder'
- : 'Class_Notice_DoubleFinder';
+ ? Class_Notice_BarcodeDoubleFinder::class
+ : Class_Notice_DoubleFinder::class;
$double = new $double_class($this->notice,
$this->id_int_bib,
@@ -1441,7 +1455,7 @@ class notice_integration {
protected function getServiceRunner() {
return null != $this->_service_runner
- ? $this->_service_runner : new Service_Runner();
+ ? $this->_service_runner : new Class_WebService_Afi;
}
@@ -1469,4 +1483,10 @@ class Service_Runner {
public function run($type, $args) {
return communication::runService($type, $args);
}
+
+
+ public function findRemoteRecordBy($args=[]) {
+ $args["no_request"] = getVariable('Z3950_cache_only');
+ $answer = $this->run(4, $args);
+ }
}
diff --git a/cosmogramme/php/classes/classe_unimarc.php b/cosmogramme/php/classes/classe_unimarc.php
index 4935e7b0319d25ea5f09c517bd06ff1da7744741..e2576dc2d88a293426addec33d611d32c67d270d 100644
--- a/cosmogramme/php/classes/classe_unimarc.php
+++ b/cosmogramme/php/classes/classe_unimarc.php
@@ -502,8 +502,9 @@ class notice_unimarc extends iso2709_record {
$champs_nouveaute = $this->getChampNouveauteAttribute();
$date_nouveaute = '';
- if ($champs_nouveaute['zone'] != '995'
- and $champs_nouveaute['zone'] > '000') {
+ if (isset($champs_nouveaute['zone'])
+ && $champs_nouveaute['zone'] != '995'
+ && $champs_nouveaute['zone'] > '000') {
$data = $this->get_subfield($champs_nouveaute['zone'], $champs_nouveaute['champ']);
if ($data[0] > '')
$date_nouveaute = $this->calculDateNouveaute($data[0]);
@@ -1140,10 +1141,12 @@ class notice_unimarc extends iso2709_record {
$label = $this->inner_guide['dt'] . $this->inner_guide['bl'];
$champ_code_barres = $this->getBarcode();
- if (!isset($this->profil['attributs'][0]['item_zone']) || !$zone = $this->profil['attributs'][0]['item_zone'])
+ if (!isset($this->profil['attributs'][0]['item_zone'])
+ || !$zone = $this->profil['attributs'][0]['item_zone'])
$zone = '995';
- if ($this->profil['attributs'][0]['champ_type_doc']) {
+ if (isset($this->profil['attributs'][0]['champ_type_doc'])
+ && $this->profil['attributs'][0]['champ_type_doc']) {
$zone = (strlen($champ_code_barres) == 3) // legacy: before 'champ_type_doc' could equal '996' or '852', which has been deprecated by introduction of 'item_zone'. Need to check if some sites in production still uses these values (some tests does...)
? $champ_code_barres
: $zone;
diff --git a/cosmogramme/php/integre_traite_main.php b/cosmogramme/php/integre_traite_main.php
index 074e8fe610f9796948e9fd77f462b2057b29fde4..3b575bdf67e4126aa4fd964951fe3ff860c93198 100644
--- a/cosmogramme/php/integre_traite_main.php
+++ b/cosmogramme/php/integre_traite_main.php
@@ -198,6 +198,7 @@ if (!$should_skip_records) {
// PSEUDO-NOTICES - cms rss sitotheque et albums (phase 0.1 a 0.6)
// ----------------------------------------------------------------
if ($phase > 0.1 and $phase < 1) {
+ $log->log('<h4>Pseudo-notices : CMS</h4>');
startIntegrationPhase('PseudoRecordCms');
startIntegrationPhase('PseudoRecordRss');
startIntegrationPhase('PseudoRecordSitotheque');
@@ -214,67 +215,24 @@ if (!$should_skip_records) {
// ----------------------------------------------------------------
// Suppression des notices sans exemplaires (PHASE 2)
// ----------------------------------------------------------------
- $log->log('Suppression des notices sans exemplaire<br>');
- setVariable("traitement_phase", "Suppression des notices sans exemplaire");
+ $log->log('<h4>Suppression des notices sans exemplaire</h4>');
startIntegrationPhase('DeleteRecordWithoutItem');
// ----------------------------------------------------------------
// INDEXATION DES ARTICLES DE PERIODIQUES
// ----------------------------------------------------------------
- if ($phase == 2)
+ if ($phase == 2) {
startIntegrationPhase('SerialArticlesIndex');
+ $phase = 3;
+ }
// ----------------------------------------------------------------
// Traiter les notices succintes (PHASE 3)
// ----------------------------------------------------------------
- require_once("classe_communication.php");
- setVariable("traitement_phase", "Intégration des notices succintes");
- $frequence = getVariable("succintes_frequence");
- $date_homogene = getVariable("succintes_date");
- $Z3950_retry_level = getVariable("Z3950_retry_level");
- $ecart = ecartDates($date, $date_homogene);
- if ($phase == 2)
- {
- $log->log("<h4>Intégration des notices succintes</h4>");
- $phase = 3;
- unset($phase_data);
- $phase_data["nombre"] = 0;
- $phase_data["timeStart"] = time();
- $chrono100notices->start();
- $phase_data["nb_homogene"] = 0;
- $phase_data["id"] = 0;
- if ($ecart < $frequence) $log->log('<span class="vert">Sera fait dans ' . ($frequence - $ecart) . ' jour(s)</span>');
- elseif (!$mode_cron) sauveContexte();
- }
- if ($phase == 3 and $ecart >= $frequence)
- {
- if (!$mode_cron) print("<h4>Intégration des notices succintes</h4>");
- $chrono->start();
- if (!$phase_data["nombre"]) $log->log('<span class="vert">Niveau de tentatives d\'homogénéisation : ' . $Z3950_retry_level . '</span>' . BR . BR);
- $result = $sql->prepareListe("select * from notices_succintes where id > '" . $phase_data["id"] . "' and z3950_retry <= $Z3950_retry_level order by id");
- while ($data = $sql->fetchNext($result))
- {
- if (!$mode_cron and $chrono->tempsPasse() > $timeout) sauveContexte();
- $ret = $notice->traiteSuccinte($data);
- $phase_data["id"] = $data["id"];
- $phase_data["nombre"]++;
- traceSuccinte($ret);
- }
- // Recap
- $log->log(BR . '<span class="vert">' . ($phase_data["nombre"]) . ' notices traitées</span>' . BR);
- $chrono->timeStart = $phase_data["timeStart"];
- $log->log('<span class="vert">Temps de traitement : ' . $chrono->end() . " (" . $chrono->moyenne($phase_data["nombre"], "notices") . ")</span>" . BR);
-
- for ($i = 0; $i < 5; $i++) if (!$phase_data[$i]) $phase_data[$i] = "0";
- $log->log('<table class="blank" cellspacing="0" cellpadding="5px" style="margin-left:25px;margin-bottom:10px;margin-top:10px">');
- $log->log('<tr><td class="blank">Notices trouvées dans la base</td><td class="blank" align="right">' . $phase_data[1] . '</td></tr>');
- $log->log('<tr><td class="blank">Notices trouvées sur serveurs z39.50</td><td class="blank" align="right">' . $phase_data[2] . '</td></tr>');
- $log->log('<tr><td class="blank">Notices non trouvées</td><td class="blank" align="right">' . $phase_data[3] . '</td></tr>');
- $log->log('<tr><td class="blank">Echecs de connexions</td><td class="blank" align="right">' . $phase_data[4] . '</td></tr>');
- $log->log('</table>');
- setVariable("succintes_date", $date);
- }
+ if ($phase == 3) {
+ startIntegrationPhase('IncompleteRecord');
+ }
// ----------------------------------------------------------------
// Traiter l'homogénéisation des notices par ISBN (PHASE 4)
@@ -743,54 +701,6 @@ function afficherRecapHomogene($phase_data, $chrono)
$log->log('</table>');
}
-// ----------------------------------------------------------------
-// Affichage detail pour les notices succintes
-// ----------------------------------------------------------------
-function traceSuccinte($ret)
-{
- global $debug_level, $phase_data, $log, $chrono100notices, $bib, $compteur;
-
- // compteurs
- if ($ret["statut"] > 0) $compteur[$ret["statut"]]++;
- switch ($ret["statut"])
- {
- case 1: $phase_data[2]++;
- break;
- case 4: $phase_data[1]++;
- break;
- default:
- {
- if ($ret["statut_z3950"] == 1) $phase_data[3]++;
- else $phase_data[4]++;
- }
- }
-
- // Traces
- if ($debug_level == 0)
- {
- if ($phase_data["nombre"] and $phase_data["nombre"] % 100 == 0)
- {
- $log->log("notice " . $phase_data["nombre"] . " (" . $chrono100notices->tempsPasse() . " secondes)" . BR);
- $chrono100notices->start();
- }
- return;
- }
- $log->log('<a class="notice" href="' . URL_BASE . "php/analyse_afficher_notice_full.php?id_notice=" . $ret["id_notice"] . '">Notice n° ' . $ret["id_notice"] . '</a>' . BR);
- $log->log('<table class="blank" cellspacing="0" cellpadding="5px" style="margin-left:15px;margin-bottom:10px">');
- $log->log('<tr><td class="blank">Bibliothèque</td><td class="blank">' . $bib->getNomCourt($ret["id_bib"]) . '</td></tr>');
- if ($ret["isbn"]) $log->log('<tr><td class="blank">Isbn</td><td class="blank">' . $ret["isbn"] . '</td></tr>');
- if ($ret["ean"]) $log->log('<tr><td class="blank">Ean</td><td class="blank">' . $ret["ean"] . '</td></tr>');
- if ($ret["id_commerciale"]) $log->log('<tr><td class="blank">No commercial</td><td class="blank">' . $ret["id_commerciale"] . '</td></tr>');
- if ($ret["statut"] == 4) $log->log('<tr><td class="blank">Statut</td><td class="blank"><span class="vert">Trouvée dans la base</span></td></tr>');
- else
- {
- $log->log('<tr><td class="blank">Serveur</td><td class="blank">' . $ret["serveur"] . '</td></tr>');
- if ($ret["statut_z3950"] > 1) $class = "vert";
- $log->log('<tr><td class="blank">Statut</td><td class="blank"><span class="' . $class . '">' . communication::getLibelleStatutZ3950($ret["statut_z3950"]) . '</span></td></tr>');
- }
- if ($ret["erreur"]) $log->log('<tr><td class="blank">Erreur</td><td class="blank"><span class="rouge">' . $ret["erreur"] . '</span></td></tr>');
- $log->log('</table>');
-}
// ----------------------------------------------------------------
// Gestion du contexte pour les timeout
diff --git a/cosmogramme/tests/php/classes/NoticeIntegrationSuccinteTest.php b/cosmogramme/tests/php/classes/NoticeIntegrationSuccinteTest.php
deleted file mode 100644
index d6e1569eb884b6338683097acd6d247283bb0292..0000000000000000000000000000000000000000
--- a/cosmogramme/tests/php/classes/NoticeIntegrationSuccinteTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012-2014, 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';
-
-
-class NoticeIntegrationSuccinteTest extends ModelTestCase {
- /** @test */
- public function fooShouldBar() {
- VariableCache::getInstance()
- ->setValeurCache(['filtrer_fulltext' => 1,
- 'mode_doublon'=> 1,
- 'tracer_accents_iso'=>1,
- 'non_exportable'=> 'electre;decitre;gam;zebris',
- 'controle_codes_barres'=> 0,
- 'unimarc_zone_titre' => '200$a;461$t',
- 'unicite_code_barres' => Class_CosmoVar::UNIQ_BARCODE_ONLY,
- 'champs_sup' => '',
- 'ean_345' => '',
- 'Z3950_cache_only' => '0',
- 'unimarc_zone_matiere' => '600abcjxyz;601abcx;602ajxyz;605a;606ajxyz;607ajxyz;608ajxyz;610aejxyz;615amnx;616acfjxy;620abcdefghi;909a',
- 'homogene_code_qualite' => 10])
- ->setListeCache(['nature_docs'=> "1:Collection\r\n2:Dataset\r\n3:Event\r\n4:Image",
- 'types_docs' => "0:non identifié\r\n1:livres\r\n2:périodiques\r\n3:disques\r\n4:DVD\r\n5:cédéroms\r\n8:articles cms\r\n9:fils rss\r\n10:sites internet\r\n100:Livre Numérique\r\n101:Diaporamas\r\n102:Type doc\r\n103:OAI\r\n104:Type doc\r\n105:Formation Vodéclic\r\n106:Livres Numériques\r\n107:Vidéos à la demande\r\n108:Tout apprendre\r\n109:Enregistrement audio\r\n110:Numérique Premium",
- 'champs_abonne' => '']);
-
- Class_Notice::beVolatile();
- Class_Exemplaire::beVolatile();
-
- global $sql;
- $sql = $this->_mock_sql = Storm_Test_ObjectWrapper::mock();
- $sql
- ->whenCalled('fetchAll')
- ->with('select * from codif_section', false)
- ->answers([])
-
- ->whenCalled('fetchAll')
- ->with('select * from codif_genre', false)
- ->answers([])
-
- ->whenCalled('fetchAll')
- ->with('select * from codif_emplacement', false)
- ->answers([])
-
- ->whenCalled('fetchOne')
- ->with("select id_notice from exemplaires where id_int_bib=1 and code_barres='711554'")
- ->answers(null)
-
- ->whenCalled('fetchOne')
- ->with("select id_notice from notices where clef_alpha='--MORSEN--INSIDEOUTMUSIC-2005-3'")
- ->answers(null)
-
- ->whenCalled('fetchEnreg')
- ->with("select * from profil_donnees where id_profil=1")
- ->answers(['id_profil' => 1,
- 'libelle' => 'Unimarc standard',
- 'accents' => 1,
- 'rejet_periodiques' => 1,
- 'id_article_periodique' => 0,
- 'type_fichier' => 0,
- 'format' => 0,
- 'attributs: a:6:{i:0;a:7:{s:8:"type_doc";a:11:{i:0;a:3:{s:4:"code";s:1:"0";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:1;a:3:{s:4:"code";s:1:"1";s:5:"label";s:5:"am;na";s:8:"zone_995";s:0:"";}i:2;a:3:{s:4:"code";s:1:"2";s:5:"label";s:2:"as";s:8:"zone_995";s:0:"";}i:3;a:3:{s:4:"code";s:1:"3";s:5:"label";s:3:"i;j";s:8:"zone_995";s:0:"";}i:4;a:3:{s:4:"code";s:1:"4";s:5:"label";s:1:"g";s:8:"zone_995";s:0:"";}i:5;a:3:{s:4:"code";s:1:"5";s:5:"label";s:3:"l;m";s:8:"zone_995";s:0:"";}i:6;a:3:{s:4:"code";s:1:"8";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:7;a:3:{s:4:"code";s:1:"9";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:8;a:3:{s:4:"code";s:2:"10";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:9;a:3:{s:4:"code";s:3:"100";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}i:10;a:3:{s:4:"code";s:2:"10";s:5:"label";s:0:"";s:8:"zone_995";s:0:"";}}s:17:"champ_code_barres";s:1:"f";s:10:"champ_cote";s:1:"k";s:11:"champ_genre";s:0:"";s:13:"champ_section";s:1:"q";s:17:"champ_emplacement";s:1:"u";s:12:"champ_annexe";s:1:"a";}i:1;a:1:{s:6:"champs";s:0:"";}i:2;a:1:{s:6:"champs";s:0:"";}i:3;a:1:{s:6:"champs";s:0:"";}i:4;a:5:{s:4:"zone";s:0:"";s:5:"champ";s:0:"";s:6:"format";s:0:"";s:5:"jours";s:0:"";s:7:"valeurs";s:0:"";}i:5;a:2:{s:17:"xml_balise_abonne";s:0:"";s:17:"xml_champs_abonne";a:10:{s:6:"IDABON";s:0:"";s:9:"ORDREABON";s:0:"";s:3:"NOM";s:0:"";s:6:"PRENOM";s:0:"";s:9:"NAISSANCE";s:0:"";s:8:"PASSWORD";s:0:"";s:4:"MAIL";s:0:"";s:10:"DATE_DEBUT";s:0:"";s:8:"DATE_FIN";s:0:"";s:7:"ID_SIGB";s:0:"";}}}'])
-
- ->whenCalled('execute')
- ->with("Update notices_succintes set z3950_retry = z3950_retry +1 Where id=358")
- ->answers(true)
-
- ->beStrict();
-
- $succinte = ['id' => 358,
- 'id_bib' => 1,
- 'profil' => 0,
- 'data' => 'a:37:{s:6:"statut";i:0;s:4:"isbn";s:0:"";s:6:"isbn10";s:0:"";s:6:"isbn13";s:0:"";s:3:"ean";s:13:"0693723486222";s:10:"id_origine";s:6:"340054";s:10:"clef_alpha";s:31:"--MORSEN--INSIDEOUTMUSIC-2005-3";s:11:"clef_oeuvre";s:9:"--MORSEN-";s:12:"clef_chapeau";s:0:"";s:11:"titre_princ";s:0:"";s:10:"tome_alpha";N;s:11:"alpha_titre";s:0:"";s:14:"id_commerciale";s:7:"3110042";s:6:"titres";a:1:{i:0;s:0:"";}s:7:"auteurs";a:1:{i:0;s:10:"Morse|Neal";}s:15:"auteurs_renvois";a:0:{}s:12:"alpha_auteur";s:10:"MORSE NEAL";s:7:"editeur";s:15:"InsideOut Music";s:10:"collection";a:0:{}s:8:"matieres";a:1:{i:0;s:29:"Rock progressif : États-Unis";}s:16:"matieres_renvois";a:0:{}s:5:"annee";s:4:"2005";s:8:"type_doc";s:1:"3";s:14:"infos_type_doc";a:3:{s:4:"code";s:1:"3";s:5:"infos";s:25:"Label=jm - 995$r=CD - $p=";s:7:"libelle";N;}s:10:"exportable";b:0;s:5:"dewey";N;s:8:"thesauri";a:0:{}s:4:"cote";s:7:"2 MOR 4";s:7:"langues";a:1:{i:0;s:3:"eng";}s:13:"champs_forces";N;s:7:"interet";N;s:18:"statut_exemplaires";a:4:{s:5:"nb_ex";i:1;s:14:"nb_ex_detruits";i:0;s:12:"codes_barres";i:0;s:5:"cotes";i:0;}s:11:"exemplaires";a:1:{i:0;a:7:{s:8:"activite";s:18:"peut être prêté";s:7:"zone995";s:836:"a:15:{i:0;a:2:{s:4:"code";s:1:"f";s:6:"valeur";s:6:"711554";}i:1;a:2:{s:4:"code";s:1:"w";s:6:"valeur";s:10:"2014-04-14";}i:2;a:2:{s:4:"code";s:1:"6";s:6:"valeur";s:1:"0";}i:3;a:2:{s:4:"code";s:1:"9";s:6:"valeur";s:6:"111127";}i:4;a:2:{s:4:"code";s:1:"c";s:6:"valeur";s:3:"BLV";}i:5;a:2:{s:4:"code";s:1:"2";s:6:"valeur";s:1:"0";}i:6;a:2:{s:4:"code";s:1:"k";s:6:"valeur";s:7:"2 MOR 4";}i:7;a:2:{s:4:"code";s:1:"5";s:6:"valeur";s:10:"2014-04-14";}i:8;a:2:{s:4:"code";s:1:"8";s:6:"valeur";s:4:"ROCK";}i:9;a:2:{s:4:"code";s:1:"o";s:6:"valeur";s:1:"0";}i:10;a:2:{s:4:"code";s:1:"e";s:6:"valeur";s:2:"RA";}i:11;a:2:{s:4:"code";s:1:"r";s:6:"valeur";s:2:"CD";}i:12;a:2:{s:4:"code";s:1:"4";s:6:"valeur";s:1:"0";}i:13;a:2:{s:4:"code";s:1:"b";s:6:"valeur";s:3:"BLV";}i:14;a:2:{s:4:"code";s:1:"z";s:6:"valeur";s:29:"Pôle Musique et Arts Vivants";}}";s:11:"code_barres";s:6:"711554";s:4:"cote";s:7:"2 MOR 4";s:11:"emplacement";s:2:"20";s:6:"annexe";s:3:"BLV";s:14:"date_nouveaute";s:11:"57032-09-10";}}s:12:"emplacements";a:1:{i:0;s:2:"20";}s:7:"unimarc";s:1157:"01157cjm0a22004212 450 001000700000005001700007035001500024071001200039073001800051090001100069100004100080101000800121200004100129210004100170215003000211229002000241464003300261464001800294464001700312464001800329464001600347464002100363464002600384464002300410464000700433464001300440464002400453464003300477606006100510686001700571690001100588692003200599700003600631801000800667801002200675801002200697951001600719 340054 20140415031806.0 ablv-X72792 00 a3110042 a0693723486222 a340054 a20090129dP 20 u0frey5003 ba aeng 1 a? bEnregistrement sonore fNeal Morse 33391 aKleve cInsideOut Music dP 2005 a1 d. c. e1 brochure 16 p. 3965 aINSIDE OUT 1 tThe temple of the living god 1 tAnother world 1 tThe outsider 1 tSweet elation 1 tIn the fire 1 tSolid as the sun 1 tThe glory of the lord 1 tOutside looking in 1 t12 1 tEntrance 1 tInside his presence 1 tThe temple of the living god 9385551 aRock progressif yÉtats-Unis 359159 33015 328483 3123032 a2.42 3666 aB 3965 aINSIDE OUT 2CS1 NLabel 9385550 aMorse bNeal 388793 4590 1 bGAM 2 aFR bBLV c20100220 3 aFR bBLV c20140414 aDK b ** c1 ";s:8:"warnings";a:0:{}s:7:"qualite";s:1:"5";}',
- 'z3950_retry' => 0,
- 'date_creation' => '2014-09-02 02:17:41'];
-
- $this->_result = (new notice_integration())
- ->setServiceRunner($this->mock()
- ->whenCalled('run')
- ->with(4, ['isbn' => '',
- 'ean' => '0693723486222',
- 'id_commerciale' => '3110042',
- 'no_request' => 0])
- ->answers(['statut' => "OK",
- 'statut_z3950' => "3",
- 'serveur' => "Bnf",
- 'erreur' => false,
- 'unimarc' => '01075cjm 22002893 450 001002100000009004700021020001700068021005400085071004100139073001800180100004100198101000800239102000700247126002500254200007900279210006800358215004700426306003500473608002100508608001600529608003500545686007000580700003600650716002900686801003900715930003100754 FRBNF400642570000008 http://catalogue.bnf.fr/ark:/12148/cb400642576 aFR b70601036 5FR-759999999:SDC 12-202181 aFR bDLS-20051103-9170 01 bInsideOutMusic aSPV 48622 CD cboîte 0 a0693723486222 a20051103d2005 u y0frey50 ba 0 aeng aDE aaguxhxx||||||cd bbex 1 a? bEnregistrement sonore fNeal Morse, chant, guit., claviers [acc. instr.] aKleve cInsideOutMusic a[Paris] c[distrib. Wagram music] dP 2005 a1 disque compact (56 min 26 s) e1 brochure aProd. : InsideOutMusic, P 2005 arock, pop 2frTAV arock 2frTAV aÉdition phonographique 2frTAV a106 2Cadre de classement de la Bibliographie nationale française | 314208951 aMorse bNeal 4721 4545 314032403 aInsideOutMusic 0 aFR bBNF c20051103 gAFNOR 2intermrc 5FR-759999999:SDC 12-202181 '])
- ->beStrict())
- ->traiteSuccinte($succinte);
-
- $this->assertEquals(0, $this->_result['statut']);
- }
-}
diff --git a/library/Class/Cosmogramme/Integration/PhaseAbstract.php b/library/Class/Cosmogramme/Integration/PhaseAbstract.php
index f84f93b33a606064e77fbc7c5452fd25faf3f537..c28775839f55112e45295970d4014cae07defc5b 100644
--- a/library/Class/Cosmogramme/Integration/PhaseAbstract.php
+++ b/library/Class/Cosmogramme/Integration/PhaseAbstract.php
@@ -32,6 +32,11 @@ abstract class Class_Cosmogramme_Integration_PhaseAbstract {
$_db_reset = true;
+ /**
+ * @param $phase Class_Cosmogramme_Integration_Phase
+ * @param $log Class_Cata_Log
+ * @param $chrono Class_Cosmogramme_Integration_Chronometre
+ */
public function __construct($phase, $log, $chrono) {
$this->_phase = $phase;
$this->_log = $log;
@@ -71,7 +76,7 @@ abstract class Class_Cosmogramme_Integration_PhaseAbstract {
->beSameCronAs($this->_phase)
->beSameCountAs($this->_phase);
- $this->_log->log('<h4>' . $this->_label . '</h4>');
+ $this->_logMessage('<h4>' . $this->_label . '</h4>');
$this->_init($new_phase);
return $new_phase;
}
@@ -157,6 +162,7 @@ abstract class Class_Cosmogramme_Integration_PhaseAbstract {
public function isTimeOut() {
if (!$this->_chrono)
return false;
+
return !$this->_phase->isCron()
&& $this->_chrono->mainElapsed() > $this->_chrono->timeout();
}
@@ -183,4 +189,20 @@ abstract class Class_Cosmogramme_Integration_PhaseAbstract {
$this->_db_reset = false;
return $this;
}
-}
\ No newline at end of file
+
+
+ protected function _logMessage($message) {
+ if ($this->_log)
+ $this->_log->log($message);
+
+ return $this;
+ }
+
+
+ protected function _logSuccess($message) {
+ if ($this->_log)
+ $this->_log->success($message);
+
+ return $this;
+ }
+}
diff --git a/library/Class/Cosmogramme/Integration/PhaseIncompleteRecord.php b/library/Class/Cosmogramme/Integration/PhaseIncompleteRecord.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b3bd64572fdc6598c81870355bccfcd07d266a3
--- /dev/null
+++ b/library/Class/Cosmogramme/Integration/PhaseIncompleteRecord.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Copyright (c) 2012-2021, 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 'cosmogramme/php/classes/classe_notice_integration.php';
+
+
+class Class_Cosmogramme_Integration_PhaseIncompleteRecord
+ extends Class_Cosmogramme_Integration_PhaseAbstract {
+ use Trait_ServiceRunnerAware;
+
+ const MY_ID = 3;
+
+ protected
+ $_integrator,
+ $_locally = 0,
+ $_remotly = 0,
+ $_not_found = 0,
+ $_error = 0;
+
+ public function __construct($phase, $log, $chrono) {
+ parent::__construct($phase, $log, $chrono);
+ $this->_label = $this->_('Intégration des notices succintes');
+ $this->_integrator = (new notice_integration)->setServiceRunner(static::$_service_runner);
+ }
+
+
+ protected function _init($phase) {
+ $phase
+ ->resetDatas()
+ ->setData('nombre', 0)
+ ->setData('id', 0);
+
+ $this->_chrono
+ ->startOnFile()
+ ->startOnRecords();
+
+ return $this;
+ }
+
+
+ /** @return array **/
+ protected function _previousPhaseIds() {
+ return [3];
+ }
+
+
+ protected function _wasRunning() {
+ return $this->_getData('nombre') > 0;
+ }
+
+
+ protected function _execute() {
+ if (!$this->_phase->isCron()) {
+ $this->_logMessage($this->_('Les notices succintes ne sont traitées qu\'en mode cron.'));
+ return;
+ }
+
+ $frequence = Class_CosmoVar::getValueOf('succintes_frequence');
+ $date_homogene = Class_CosmoVar::getValueOf('succintes_date');
+ $ecart = $this->getTimeSource()->daysFrom(strtotime($date_homogene));
+ if ($ecart < $frequence) {
+ $this->_logSuccess($this->_('Sera fait dans %s jours', $frequence - $ecart));
+ return;
+ }
+
+ $retry_level = Class_CosmoVar::getValueOf('Z3950_retry_level');
+ $this->_logSuccess($this->_('Niveau de tentatives d\'homogénéisation : %s', $retry_level));
+
+ while ($records = $this->_findPage($retry_level)) {
+ $this->_runPage($records);
+ $this->_cleanMemory();
+ }
+
+ $processed = $this->_getData('nombre');
+ $this->_logSuccess($this->_plural($processed,
+ 'aucune notice traitée',
+ '%d notice traitée',
+ '%d notices traitées',
+ $processed));
+
+ $this->_logSuccess($this->_('Temps de traitement : %s (%s)',
+ $this->_chrono->endFile(),
+ $this->_chrono->meanOnFile($processed, $this->_('notices'))));
+
+ $this->_summarize();
+
+ Class_CosmoVar::setValueOf('succintes_date', static::getCurrentDate());
+ }
+
+
+ protected function _findPage($retry_level) {
+ $params = ['where' => sprintf('z3950_retry <= %s and id > %s',
+ $retry_level,
+ $this->_getData('id')),
+ 'order' => 'id',
+ 'limit' => 100];
+
+ return Class_NoticeSuccincte::findAllBy($params);
+ }
+
+
+ protected function _runPage($records) {
+ $this->_logPage();
+ foreach($records as $record)
+ $this->_runOne($record);
+ }
+
+
+ protected function _logPage() {
+ if ((!$current = $this->_getData('nombre'))
+ || (0 != $current % 100))
+ return $this;
+
+ $this->_logSuccess($this->_('notice %s (%s secondes)',
+ $current,
+ $this->_chrono->elapsedOnRecords()));
+ $this->_chrono->startOnRecords();
+
+ return $this;
+ }
+
+
+ protected function _runOne($record) {
+ $this
+ ->_incrementData('nombre')
+ ->_setData('id', $record->getId());
+
+ $result = $this->_integrator->traiteSuccinte($record);
+ if (Class_NoticeSuccincte::STATUS_ERROR === $result) {
+ $this->_error++;
+ return $this;
+ }
+
+ if (Class_NoticeSuccincte::STATUS_NOTFOUND === $result) {
+ $this->_not_found++;
+ return $this;
+ }
+
+ if (Class_NoticeSuccincte::STATUS_REMOTE === $result) {
+ $this->_remotly++;
+ return $this;
+ }
+
+ if (Class_NoticeSuccincte::STATUS_LOCAL === $result)
+ $this->_locally++;
+
+ return $this;
+ }
+
+
+ protected function _summarize() {
+ $this->_logMessage('<table class="blank" cellspacing="0" cellpadding="5px" style="margin-left:25px;margin-bottom:10px;margin-top:10px">');
+ $map = [$this->_('Notices trouvées dans la base') => $this->_locally,
+ $this->_('Notices trouvées sur serveurs z39.50') => $this->_remotly,
+ $this->_('Notices non trouvées') => $this->_not_found,
+ $this->_('Échecs de connexions') => $this->_error];
+ foreach($map as $label => $count)
+ $this
+ ->_logMessage(sprintf('<tr><td class="blank">%s</td><td class="blank" align="right">%d</td></tr>',
+ $label, $count));
+
+ $this->_logMessage('</table>');
+ }
+}
diff --git a/library/Class/Cosmogramme/Integration/PhaseNotice.php b/library/Class/Cosmogramme/Integration/PhaseNotice.php
index 94cdb6523a0f280cd047efd900eba68ffbd23f51..ec0d445d8ea5faeb6ab249946907c5cebed2a9ef 100644
--- a/library/Class/Cosmogramme/Integration/PhaseNotice.php
+++ b/library/Class/Cosmogramme/Integration/PhaseNotice.php
@@ -23,11 +23,10 @@ require_once('cosmogramme/php/classes/classe_notice_integration.php');
class Class_Cosmogramme_Integration_PhaseNotice
extends Class_Cosmogramme_Integration_PhaseOnDataSource {
+ use Trait_ServiceRunnerAware;
const MY_ID = 0;
- protected static $_service_runner;
-
protected function _init($phase) {}
@@ -125,10 +124,4 @@ class Class_Cosmogramme_Integration_PhaseNotice
. '</span><br>')
: '';
}
-
-
- /** @category testing */
- public static function setServiceRunner($runner) {
- static::$_service_runner = $runner;
- }
}
diff --git a/library/Class/Cosmogramme/Integration/PhaseSerialArticlesIndex.php b/library/Class/Cosmogramme/Integration/PhaseSerialArticlesIndex.php
index 83742f78b6e7658e88f8763fe38f66a6ed06ce57..945f0fbed1d291b18924a90f4dcd52c072488def 100644
--- a/library/Class/Cosmogramme/Integration/PhaseSerialArticlesIndex.php
+++ b/library/Class/Cosmogramme/Integration/PhaseSerialArticlesIndex.php
@@ -43,7 +43,7 @@ class Class_Cosmogramme_Integration_PhaseSerialArticlesIndex
}
- public function _init($phase) {
+ protected function _init($phase) {
$phase
->resetDatas()
->setData('nombre', 0)
@@ -60,7 +60,7 @@ class Class_Cosmogramme_Integration_PhaseSerialArticlesIndex
}
- public function _execute() {
+ protected function _execute() {
$this->_seen_ids = [];
while ($articles = $this->_findPage())
diff --git a/library/Class/Notice/WorkKey.php b/library/Class/Notice/WorkKey.php
index ba8ec1ce452510418db0d6d54bcaf2f3b57f53cb..0fd3610089c919d8b7767c730ff16ea5e1009c70 100644
--- a/library/Class/Notice/WorkKey.php
+++ b/library/Class/Notice/WorkKey.php
@@ -28,6 +28,11 @@ class Class_Notice_WorkKey {
}
+ public static function legacyKeyString($record) {
+ return static::legacy()->keyString($record);
+ }
+
+
public function keyString($record) {
$work_key_method = $this->_workKeyMethod();
if ($record->isArticleCms() && $article = $record->getArticle())
diff --git a/library/Class/NoticeSuccincte.php b/library/Class/NoticeSuccincte.php
index 5b81d8a1ff904c5e8d9fa4e3d117b331d5824b4a..68536c39e09e5c1f36b535e343f16a929bf1607d 100644
--- a/library/Class/NoticeSuccincte.php
+++ b/library/Class/NoticeSuccincte.php
@@ -20,10 +20,27 @@
*/
class Class_NoticeSuccincte extends Storm_Model_Abstract {
+ const
+ STATUS_LOCAL = 'local',
+ STATUS_REMOTE = 'remote',
+ STATUS_NOTFOUND = 'notfound',
+ STATUS_ERROR = 'error';
+
protected
$_table_name = 'notices_succintes',
$_belongs_to = ['bib' => ['model' => 'Class_IntBib',
- 'referenced_in' => 'id_bib']];
+ 'referenced_in' => 'id_bib']],
+
+ $_data_as_array_cache;
+
+ public function getDataAsArray() {
+ return $this->_data_as_array_cache = isset($this->_data_as_array_cache)
+ ? $this->_data_as_array_cache
+ : unserialize($this->getData());
+ }
+
+ public function incrementRetry() {
+ return $this->setZ3950Retry($this->getZ3950Retry() + 1);
+ }
}
-?>
diff --git a/library/Class/WebService/Afi.php b/library/Class/WebService/Afi.php
new file mode 100644
index 0000000000000000000000000000000000000000..05f513c43ff6ba3469eafcd887070f208be092ab
--- /dev/null
+++ b/library/Class/WebService/Afi.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * Copyright (c) 2012-2021, 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_WebService_Afi extends Class_WebService_Abstract {
+ use Trait_Translator, Trait_InspectorGadgetAware;
+
+ const
+ RETOUR_SERVICE_OK = 2,
+ SVC_API = '2.0',
+ SVC_GET_RECORD_Z3950 = 4,
+ SVC_GET_TRAILER = 6,
+ SVC_GET_INTERVIEW = 7,
+ SVC_GET_BIOGRAPHY = 8,
+ SVC_GET_VIDEO = 9,
+ SVC_GET_THUMBNAIL = 10,
+ SVC_SET_THUMBNAIL = 12,
+ SVC_SET_BIOGRAPHY = 13,
+ SVC_SET_TRAILER = 14,
+
+ FORMAT_JSON = 'json',
+ FORMAT_TABULATED = 'tab',
+
+ BIO_ENABLED = 0,
+ BIO_DISABLED = 1,
+
+ DISABLE_TRAILER = 'disable_trailer',
+ TRAILER_ENABLED = 0,
+ TRAILER_DISABLED = 1;
+
+ protected static $_key;
+
+ /** @category testing */
+ public static function setKey($key) {
+ static::$_key = $key;
+ }
+
+
+ protected static function _getKey() {
+ return isset(static::$_key)
+ ? static::$_key
+ : md5('IMG' . date('DxzxYxM') . 'VIG');
+ }
+
+
+ public function getBiography($args) {
+ return array_merge(['statut_recherche' => 1,
+ 'erreur' => '',
+ 'source' => '',
+ 'url_source' => '',
+ 'biographie' => '',
+ 'vignette' => '',
+ 'image' => '',
+ 'wikidata_id' => '',
+ 'youtube_channel_id' => '',
+ 'isni' => '',
+ 'ark' => '',
+ 'biography_disabled' => 0],
+ $this->runService(static::SVC_GET_BIOGRAPHY, $args));
+ }
+
+
+ public function getVideo($args) {
+ return array_merge(['source' => '', 'video' => ''],
+ $this->runService(static::SVC_GET_VIDEO, $args));
+ }
+
+
+ public function getInterviews($args) {
+ return array_merge(['source' => '', 'videos' => []],
+ $this->runService(static::SVC_GET_INTERVIEW, $args));
+ }
+
+
+ public function getTrailers($args) {
+ return array_merge(['source' => '', 'player' => ''],
+ $this->runService(static::SVC_GET_TRAILER, $args));
+ }
+
+
+ public function getThumbnail($args) {
+ if ($headers = (new Class_AdminVar_PelliculeSettings)->headers())
+ $args['headers'] = $headers;
+
+ return $this->runService(static::SVC_GET_THUMBNAIL, $args);
+ }
+
+
+ public function setThumbnailOfRecord($record, $url) {
+ return ($record && $url)
+ ? $this->setThumbnail(array_filter(['isbn' => $record->getIsbn(),
+ 'ean' => $record->getEan(),
+ 'type_doc' => $record->getFamilleId(),
+ 'titre' => $record->getTitrePrincipal(),
+ 'auteur' => $record->getAuteurPrincipal(),
+ 'image' => $url,
+ 'numero' => $record->getTomeAlpha(),
+ 'clef_chapeau' => $record->getClefChapeau()]))
+ : [];
+ }
+
+
+ public function setThumbnail($args) {
+ return $this->runService(static::SVC_SET_THUMBNAIL, $args);
+ }
+
+
+ public function setBiographyOfRecord($record, $author, $url) {
+ if (!$record || !$url)
+ return [];
+
+ $work_key = Class_Notice_WorkKey::legacyKeyString($record);
+
+ return $this->setBiography(array_filter(['url_auteur' => $url,
+ 'auteur' => $author,
+ 'clef_oeuvre' => $work_key]));
+ }
+
+
+ public function disableBiographyForRecord($record, $author, $lang) {
+ return $this->_toggleBiographyForRecord($record, $author, $lang, static::BIO_DISABLED);
+ }
+
+
+ public function enableBiographyForRecord($record, $author, $lang) {
+ return $this->_toggleBiographyForRecord($record, $author, $lang, static::BIO_ENABLED);
+ }
+
+
+ protected function _toggleBiographyForRecord($record, $author, $lang, $status) {
+ if (!$record
+ || !$author
+ || !in_array($status, [static::BIO_ENABLED, static::BIO_DISABLED]))
+ return [];
+
+ $work_key = Class_Notice_WorkKey::legacyKeyString($record);
+
+ return $this->setBiography(['auteur' => $author->getLibelle(),
+ 'clef_oeuvre' => $work_key,
+ 'language' => $lang,
+ 'biography_disabled' => $status]);
+ }
+
+
+ public function setBiography($args) {
+ return $this->runService(static::SVC_SET_BIOGRAPHY, $args);
+ }
+
+
+ public function setTrailerForRecord($record, $url) {
+ if (!$record || !$url)
+ return [];
+
+ $work_key = Class_Notice_WorkKey::legacyKeyString($record);
+
+ return $this->setTrailer(array_filter(['url_trailer' => $url,
+ 'clef_oeuvre' => $work_key,
+ 'type_doc' => $record->getFamilleId()]));
+ }
+
+
+ public function disableTrailerForRecord($record) {
+ return $this->_toggleTrailerForRecord($record, static::TRAILER_DISABLED);
+ }
+
+
+ public function enableTrailerForRecord($record) {
+ return $this->_toggleTrailerForRecord($record, static::TRAILER_ENABLED);
+ }
+
+
+ protected function _toggleTrailerForRecord($record, $status) {
+ if (!$record || !in_array($status, [static::TRAILER_DISABLED, static::TRAILER_ENABLED]))
+ return [];
+
+ $work_key = Class_Notice_WorkKey::legacyKeyString($record);
+ $args = array_filter(['clef_oeuvre' => $work_key,
+ 'type_doc' => $record->getFamilleId()]);
+ $args[static::DISABLE_TRAILER] = $status;
+
+ return $this->setTrailer($args);
+ }
+
+
+ public function setTrailer($args) {
+ return $this->runService(static::SVC_SET_TRAILER, $args);
+ }
+
+
+ public function getRecordZ3950($args) {
+ return $this->runService(static::SVC_GET_RECORD_Z3950,
+ array_merge($args,
+ ['format' => static::FORMAT_TABULATED]));
+ }
+
+
+ public function isTrailerDisabled($data) {
+ return isset($data[static::DISABLE_TRAILER])
+ && ($data[static::DISABLE_TRAILER] == static::TRAILER_DISABLED);
+ }
+
+
+ public function isResultOk($result) {
+ return isset($result['statut_recherche'])
+ && static::RETOUR_SERVICE_OK == $result['statut_recherche'];
+ }
+
+
+ public function runService($action, $args) {
+ if (!$action || (!$url_service = Class_CosmoVar::get('url_services')))
+ return [];
+
+ if (!$args)
+ $args = [];
+
+ $options = isset($args['headers'])
+ ? ['headers' => $args['headers']]
+ : [];
+ unset($args['headers']);
+
+ $format = static::FORMAT_JSON;
+ if (isset($args['format'])
+ && in_array($args['format'],
+ [static::FORMAT_JSON, static::FORMAT_TABULATED])) {
+ $format = $args['format'];
+ unset($args['format']);
+ }
+
+ $args['src'] = static::_getKey();
+ $args['api'] = static::SVC_API;
+ $args['action'] = $action;
+
+ $url = $url_service . '?' . http_build_query($args);
+
+ try {
+ $response = $this->httpGet($url, $options);
+ static::_inspectorLog();
+ } catch(Exception $e) {
+ static::_inspectorLogError($url, $e->getMessage());
+ return [];
+ }
+
+ if (static::FORMAT_JSON == $format)
+ return ($response = json_decode($response, true))
+ ? $response
+ : [];
+
+ if (static::FORMAT_TABULATED == $format)
+ return $this->_tabResponse($response);
+
+ return [];
+ }
+
+
+ protected function _tabResponse($response) {
+ if (false === strpos($response, "\t"))
+ return $this->_error($response
+ ? $response
+ : $this->_('erreur http request'));
+
+ $datas = [];
+ $lines = explode("\t", $response);
+ foreach($lines as $line)
+ $datas = $this->_addTabLineIn($line, $datas);
+
+ return array_filter($datas);
+ }
+
+
+ protected function _addTabLineIn($line, $datas) {
+ if (!$pos = strpos($line, '='))
+ return;
+
+ $datas[substr($line, 0, $pos)] = substr($line, $pos + 1);
+ return $datas;
+ }
+
+
+ protected function _error($message) {
+ return ['statut' => 'ERREUR', 'erreur' => $message];
+ }
+}
diff --git a/library/Class/WebService/AllServices.php b/library/Class/WebService/AllServices.php
index 00b8e06b9dc40257ee7c4e4ad2e0c8d6f442f134..4bffd7d2cab421d8ed9acc8737822f127c93e6e6 100644
--- a/library/Class/WebService/AllServices.php
+++ b/library/Class/WebService/AllServices.php
@@ -22,25 +22,8 @@
class Class_WebService_AllServices {
use Trait_Translator, Trait_InspectorGadgetAware;
- const
- RETOUR_SERVICE_OK = 2,
- SVC_API = '2.0',
- SVC_GET_TRAILER = 6,
- SVC_GET_BIOGRAPHY = 8,
- SVC_GET_VIDEO = 9,
- SVC_GET_INTERVIEW = 7,
- SVC_UPLOAD_THUMBNAIL = 12,
- SVC_SET_BIOGRAPHY = 13,
- SVC_SET_TRAILER = 14,
- SVC_GET_THUMBNAIL = 10,
- BIO_ENABLED = 'enabled',
- BIO_DISABLED = 'disabled',
-
- DISABLE_TRAILER = 'disable_trailer',
- TRAILER_ENABLED = 0,
- TRAILER_DISABLED = 1;
-
- private static $_http_client;
+ protected static $_http_client;
+ protected static $_service_afi;
private $services = [
'Amazon' => ['valeurs' => ['isbn' => '2709624931', 'auteur' => 'zola', 'page' => '1'],
@@ -88,80 +71,66 @@ class Class_WebService_AllServices {
'services' => ['search(@service_url, @query)']]];
+ public static function setHttpClient($client) {
+ static::$_http_client = $client;
+ }
+
+
+ protected static function _serviceAfi() {
+ return isset(static::$_service_afi)
+ ? static::$_service_afi
+ : static::$_service_afi = new Class_WebService_Afi;
+ }
+
+
public static function runServiceAfiBiographie($args) {
- return array_merge(['statut_recherche' => 1,
- 'erreur' => '',
- 'source' => '',
- 'url_source' => '',
- 'biographie' => '',
- 'vignette' => '',
- 'image' => '',
- 'wikidata_id' => '',
- 'youtube_channel_id' => '',
- 'isni' => '',
- 'ark' => '',
- 'biography_disabled' => 0],
- static::runServiceAfi(static::SVC_GET_BIOGRAPHY, $args));
+ return static::_serviceAfi()->getBiography($args);
}
public static function runServiceAfiVideo($args) {
- return array_merge(['source' => '', 'video' => ''],
- static::runServiceAfi(static::SVC_GET_VIDEO, $args));
+ return static::_serviceAfi()->getVideo($args);
}
public static function runServiceAfiInterviews($args) {
- return array_merge(['source' => '', 'videos' => []],
- static::runServiceAfi(static::SVC_GET_INTERVIEW, $args));
+ return static::_serviceAfi()->getInterviews($args);
}
public static function runServiceAfiTrailers($args) {
- return array_merge(['source' => '', 'player' => ''],
- static::runServiceAfi(static::SVC_GET_TRAILER, $args));
+ return static::_serviceAfi()->getTrailers($args);
}
- public static function runServiceAfiUploadVignette($args) {
- return static::runServiceAfi(static::SVC_UPLOAD_THUMBNAIL, $args);
+ public static function runServiceGetUrlVignette($args) {
+ return static::_serviceAfi()->getThumbnail($args);
}
- public static function runServiceAfiUploadBiographie($args) {
- return static::runServiceAfi(static::SVC_SET_BIOGRAPHY, $args);
+ public static function runServiceAfiUploadVignette($args) {
+ return static::_serviceAfi()->setThumbnail($args);
}
- public static function runServiceAfiUploadTrailer($args) {
- return static::runServiceAfi(static::SVC_SET_TRAILER, $args);
+ public static function runServiceAfiUploadBiographie($args) {
+ return static::_serviceAfi()->setBiography($args);
}
- public static function runServiceGetUrlVignette($args) {
- if ($headers = (new Class_AdminVar_PelliculeSettings)->headers())
- $args['headers'] = $headers;
-
- return static::runServiceAfi(static::SVC_GET_THUMBNAIL, $args);
+ public static function runServiceAfiUploadTrailer($args) {
+ return static::_serviceAfi()->setTrailer($args);
}
- public static function setHttpClient($client) {
- static::$_http_client = $client;
- }
+ public static function uploadVignetteForNotice($url, $id) {
+ if (!$notice = Class_Notice::find($id))
+ return $this->_('Impossible de définir la vignette d\'une notice inconnue');
+ $service = static::_serviceAfi();
+ $result = $service->setThumbnailOfRecord($notice, $url);
- public static function uploadVignetteForNotice($url, $id) {
- $notice = Class_Notice::find($id);
- $result = static::runServiceAfiUploadVignette(array_filter(['isbn' => $notice->getIsbn(),
- 'ean' => $notice->getEan(),
- 'type_doc' => $notice->getFamilleId(),
- 'titre' => $notice->getTitrePrincipal(),
- 'auteur' => $notice->getAuteurPrincipal(),
- 'image' => $url,
- 'numero' => $notice->getTomeAlpha(),
- 'clef_chapeau' => $notice->getClefChapeau()]));
- if (static::RETOUR_SERVICE_OK != $result['statut_recherche'])
+ if (!$service->isResultOk($result))
return $result['erreur'];
$notice
@@ -174,33 +143,29 @@ class Class_WebService_AllServices {
public static function uploadBiographieForNotice($url, $auteur, $id) {
- $notice = Class_Notice::find($id);
- $args = array_filter(['url_auteur' => $url,
- 'auteur' => $auteur,
- 'clef_oeuvre' => Class_Notice_WorkKey::legacy()->keyString($notice)]);
- $result = static::runServiceAfiUploadBiographie($args);
- if (static::RETOUR_SERVICE_OK != $result['statut_recherche'])
+ if (!$notice = Class_Notice::find($id))
+ return $this->_('Impossible de définir la biographie de l\'auteur d\'une notice inconnue');
+
+ $service = static::_serviceAfi();
+ $result = $service->setBiographyOfRecord($notice, $auteur, $url);
+
+ if (!$service->isResultOk($result))
return $result['message'];
}
-
public function disableBiographyForRecord($author, $record, $lang) {
- return $this->toggleBiographyForRecord($author, $record, $lang, static::BIO_DISABLED);
+ $service = static::_serviceAfi();
+ $result = $service->disableBiographyForRecord($record, $author, $lang);
+ if (!$service->isResultOk($result))
+ return $result['message'];
}
public function enableBiographyForRecord($author, $record, $lang) {
- return $this->toggleBiographyForRecord($author, $record, $lang, static::BIO_ENABLED);
- }
-
-
- public function toggleBiographyForRecord($author, $record, $lang, $status) {
- $result = static::runServiceAfiUploadBiographie(['auteur' => $author->getLibelle(),
- 'clef_oeuvre' => Class_Notice_WorkKey::legacy()->keyString($record),
- 'language' => $lang,
- 'biography_disabled' => ($status == static::BIO_DISABLED) ? 1 : 0]);
- if (static::RETOUR_SERVICE_OK != $result['statut_recherche'])
+ $service = static::_serviceAfi();
+ $result = $service->enableBiographyForRecord($record, $author, $lang);
+ if (!$service->isResultOk($result))
return $result['message'];
}
@@ -209,18 +174,63 @@ class Class_WebService_AllServices {
if (!$notice = Class_Notice::find($id))
return $this->_('Notice non trouvée');
- $result = static::runServiceAfiUploadTrailer(array_filter(['url_trailer' => $url,
- 'clef_oeuvre' => Class_Notice_WorkKey::legacy()->keyString($notice),
- 'type_doc' => $notice->getFamilleId()]));
+ if (!$url)
+ return $this->_('Url non fournie');
+
+ $service = static::_serviceAfi();
+ $result = $service->setTrailerForRecord($notice, $url);
if (!isset($result['statut_recherche']))
return $this->_('Le service n\'a pas répondu');
- if (static::RETOUR_SERVICE_OK != $result['statut_recherche'])
+ if (!$service->isResultOk($result))
return $result['message'];
}
+ public function disableTrailerForRecord($id) {
+ return $this
+ ->_toggleRecordTrailerWithCallback($id,
+ $this->_('La bande-annonce a bien été désactivée.'),
+ function($record, $service)
+ {
+ return $service->disableTrailerForRecord($record);
+ });
+ }
+
+
+ public function enableTrailerForRecord($id) {
+ return $this
+ ->_toggleRecordTrailerWithCallback($id,
+ $this->_('La bande-annonce a bien été activée.'),
+ function($record, $service)
+ {
+ return $service->enableTrailerForRecord($record);
+ });
+ }
+
+
+ protected function _toggleRecordTrailerWithCallback($id, $message, $callback) {
+ if (!$record = Class_Notice::find($id))
+ return $this->_('Notice non trouvée');
+
+ $service = static::_serviceAfi();
+ $result = $callback($record, $service);
+
+ if (!isset($result['statut_recherche']))
+ return $this->_('Le service n\'a pas répondu');
+
+ return $service->isResultOk($result)
+ ? $message
+ : $result['message'];
+ }
+
+
+ public static function isTrailerDisabled($data) {
+ return static::_serviceAfi()->isTrailerDisabled($data);
+ }
+
+
public static function httpGet($url, $args) {
if (!isset(static::$_http_client))
static::$_http_client = new Class_WebService_SimpleWebClient();
@@ -238,37 +248,6 @@ class Class_WebService_AllServices {
}
- public static function runServiceAfi($service, $args) {
- if (!$url_service = Class_CosmoVar::get('url_services'))
- return [];
-
- if (!$args)
- $args = [];
-
- $args['src'] = static::createSecurityKey();
- $args['api'] = static::SVC_API;
- $args['action'] = $service;
-
- try {
- if( !$response = json_decode(static::httpGet($url_service, $args), true))
- $response = [];
- static::_inspectorLog();
- }
- catch(Exception $e) {
- $response = [];
- static::_inspectorLogError($url_service. '?' . http_build_query($args),
- $e->getMessage());
- }
-
- return $response;
- }
-
-
- public static function createSecurityKey() {
- return md5("IMG".date("DxzxYxM")."VIG");
- }
-
-
public function testService($id_service, $id_function) {
if(!$id_service)
return false;
@@ -308,40 +287,4 @@ class Class_WebService_AllServices {
public function getServices() {
return $this->services;
}
-
-
- public function disableTrailerForRecord($id) {
- return $this->_toggelTrailerForRecord($id, $this->_('La bande-annonce a bien été désactivée.'), static::TRAILER_DISABLED);
- }
-
-
- public function enableTrailerForRecord($id) {
- return $this->_toggelTrailerForRecord($id, $this->_('La bande-annonce a bien été activée.'), static::TRAILER_ENABLED);
- }
-
-
- protected function _toggelTrailerForRecord($id, $message, $flag) {
- if ( ! $record = Class_Notice::find($id))
- return $this->_('Notice non trouvée');
-
- $args = array_filter(['clef_oeuvre' => Class_Notice_WorkKey::legacy()->keyString($record),
- 'type_doc' => $record->getFamilleId()]);
-
- $args [static::DISABLE_TRAILER] = $flag;
-
- $result = static::runServiceAfi(static::SVC_SET_TRAILER, $args);
-
- if (!isset($result['statut_recherche']))
- return $this->_('Le service n\'a pas répondu');
-
- return static::RETOUR_SERVICE_OK == $result['statut_recherche']
- ? $message
- : $result['message'];
- }
-
-
- public static function isTrailerDisabled($data) {
- return isset($data[static::DISABLE_TRAILER])
- && ($data[static::DISABLE_TRAILER] == static::TRAILER_DISABLED);
- }
}
\ No newline at end of file
diff --git a/library/Trait/ServiceRunnerAware.php b/library/Trait/ServiceRunnerAware.php
new file mode 100644
index 0000000000000000000000000000000000000000..83381c8e0049428fa63d830e78060a0b0bd55e78
--- /dev/null
+++ b/library/Trait/ServiceRunnerAware.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2012-2021, 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
+ */
+
+
+trait Trait_ServiceRunnerAware {
+ protected static $_service_runner;
+
+ /** @category testing */
+ public static function setServiceRunner($runner) {
+ static::$_service_runner = $runner;
+ }
+}
diff --git a/library/templates/Intonation/Library/Trailers.php b/library/templates/Intonation/Library/Trailers.php
index e7b816ed7bfc0f47cb6ef3aa2b524daf1995851e..faec039e65a8f73fa6f580006298ed3139170a9f 100644
--- a/library/templates/Intonation/Library/Trailers.php
+++ b/library/templates/Intonation/Library/Trailers.php
@@ -79,7 +79,7 @@ class Intonation_Library_Trailers {
$trailer_service = (new Class_WebService_AllServices);
- return ($data = $trailer_service->runServiceAfi($trailer_service::SVC_GET_TRAILER, $args))
+ return ($data = $trailer_service->runServiceAfiTrailers($args))
? $data
: [];
}
diff --git a/tests/application/modules/AbstractControllerTestCase.php b/tests/application/modules/AbstractControllerTestCase.php
index 5c7278625da17f84821e7007682a39d53f91e569..27b1811fa952ce992664c56cd8cef33b56f6069b 100644
--- a/tests/application/modules/AbstractControllerTestCase.php
+++ b/tests/application/modules/AbstractControllerTestCase.php
@@ -145,6 +145,8 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
ZendAfi_Controller_Action_Helper_TrackEvent::setDefaultWebAnalyticsClient(null);
Storm_Cache::setDefaultZendCache(null);
Class_WebService_AllServices::setHttpClient(null);
+ Class_WebService_Afi::setHttpClient(null);
+ Class_WebService_Afi::setKey(null);
Class_SessionActivityInscription::beVolatile();
Class_Url::setBaseUrl(BASE_URL);
Class_Url::setPhpMode('apache');
@@ -175,6 +177,8 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
Class_MoteurRecherche::setTimeSource(null);
Class_WebService_Abstract::resetHttpClient();
Class_WebService_AllServices::setHttpClient(null);
+ Class_WebService_Afi::setHttpClient(null);
+ Class_WebService_Afi::setKey(null);
Class_I18n::reset();
ZendAfi_Form_Element_Captcha::reset();
Class_Url::setBaseUrl(null);
diff --git a/tests/application/modules/admin/controllers/RecordsControllerTest.php b/tests/application/modules/admin/controllers/RecordsControllerTest.php
index 4d0d42cea34876b8b5df7182b7ba770ae8706352..bac853d6c8072300d607c117c5b1cad741ff1c5c 100644
--- a/tests/application/modules/admin/controllers/RecordsControllerTest.php
+++ b/tests/application/modules/admin/controllers/RecordsControllerTest.php
@@ -55,12 +55,14 @@ abstract class RecordsControllerTestCase extends Admin_AbstractControllerTestCas
Class_CosmoVar::newInstanceWithId('url_services')->setValeur('http://cache.org');
- Class_WebService_AllServices::setHttpClient($this->_http_client = $this->mock());
+ Class_WebService_Afi::setHttpClient($this->_http_client = $this->mock());
+ Class_WebService_Afi::setKey('SuperKey');
}
public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
+ Class_WebService_Afi::setHttpClient(null);
+ Class_WebService_Afi::setKey(null);
parent::tearDown();
}
}
@@ -266,7 +268,7 @@ abstract class RecordsControllerThumbnailFormatTestCase extends RecordsControlle
.'&titre='.urlencode('Harry Potter')
.'&auteur='.urlencode('J.K.Rowling')
.'&image='.urlencode('http://upload.wikimedia.org/potter.'. $this->getFormat())
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=12')
->answers(json_encode(['vignette' => 'http://cache.org/potter_thumb.'. $this->getFormat(),
@@ -340,7 +342,7 @@ class RecordsControllerThumbnailActionPostValidUrlForPeriodiqueTest extends Reco
. '&image=' . urlencode('http://upload.wikimedia.org/science_vie.jpg')
. '&numero=1118'
. '&clef_chapeau=' . urlencode('SCIENCE VIE')
- . '&src=' . Class_WebService_AllServices::createSecurityKey()
+ . '&src=SuperKey'
. '&api=2.0'
. '&action=12')
->answers(json_encode(['vignette' => 'http://cache.org/science_vie_thumb.jpg',
@@ -366,10 +368,9 @@ class RecordsControllerThumbnailPostServeurCacheErrorTest extends RecordsControl
public function setUp() {
parent::setUp();
- Class_WebService_AllServices::setHttpClient($http_client = Storm_Test_ObjectWrapper::mock()
- ->whenCalled('open_url')
- ->answers(json_encode(['statut_recherche' => 'erreur',
- 'erreur' => 'Image indisponible'])));
+ $this->_http_client->whenCalled('open_url')
+ ->answers(json_encode(['statut_recherche' => 'erreur',
+ 'erreur' => 'Image indisponible']));
$this->postDispatch('/admin/records/thumbnail/id/12345',
@@ -469,6 +470,7 @@ class RecordsControllerBiographyTest extends RecordsControllerTestCase {
class RecordsControllerDisableBiographyTest extends RecordsControllerTestCase {
public function setUp() {
parent::setUp();
+
$this->_http_client
->whenCalled('open_url')
->with('http://cache.org'
@@ -476,17 +478,18 @@ class RecordsControllerDisableBiographyTest extends RecordsControllerTestCase {
.'&clef_oeuvre=HARRYPOTTER--ROWLINGJ-'
.'&language=fr'
.'&biography_disabled=1'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=13')
->answers(json_encode(['statut_recherche' => 2]))
->beStrict();
+
$this->dispatch('/admin/records/disable-biography/author_id/345/language/fr/record_id/12345');
}
/** @test */
- public function disableBiographyShouldSendRequestToCacheServer() {
+ public function shouldSendRequestToCacheServer() {
$this->assertTrue($this->_http_client->methodHasBeenCalled('open_url'));
}
@@ -516,7 +519,7 @@ class RecordsControllerEnableBiographyTest extends RecordsControllerTestCase {
.'&clef_oeuvre=HARRYPOTTER--ROWLINGJ-'
.'&language=fr'
.'&biography_disabled=0'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=13')
->answers(json_encode(['statut_recherche' => 2]))
@@ -555,7 +558,7 @@ class RecordsControllerBiographyPostValidUrlTest extends RecordsControllerTestCa
.'?url_auteur='.urlencode('http://fr.wikipedia.org/wiki/J.K_Rowling')
.'&auteur=J.K_Rowling'
.'&clef_oeuvre=HARRYPOTTER--ROWLINGJ-'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=13')
->answers(json_encode(['url_auteur' => 'http://fr.wikipedia.org/wiki/J.K_Rowling',
@@ -576,15 +579,15 @@ class RecordsControllerBiographyPostValidUrlTest extends RecordsControllerTestCa
+
class RecordsControllerBiographyPostServeurCacheErrorTest extends RecordsControllerTestCase {
public function setUp() {
parent::setUp();
- Class_WebService_AllServices::setHttpClient($http_client = $this->mock()
- ->whenCalled('open_url')
- ->answers(json_encode(['statut_recherche' => 'erreur',
- 'message' => 'Biographie non trouvée'])));
-
+ $this->_http_client
+ ->whenCalled('open_url')
+ ->answers(json_encode(['statut_recherche' => 'erreur',
+ 'message' => 'Biographie non trouvée']));
$this->postDispatch('/admin/records/biography/id/12345',
['url_auteur' => 'http://fr.wikipedia.org/wiki/J.K_Rowling']);
@@ -625,7 +628,7 @@ class RecordsControllerTrailerPostTest extends RecordsControllerTestCase {
.'?url_trailer='.urlencode('https://youtu.be/BEPO2')
.'&clef_oeuvre=HARRYPOTTER--ROWLINGJ-'
.'&type_doc=1'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=14')
->answers(json_encode(['url_trailer' => 'http://youtu.be/BEPO2',
@@ -735,7 +738,7 @@ class RecordsControllerTrailerAdministrationTest extends RecordsControllerTestCa
.'?clef_oeuvre=HARRYPOTTER--ROWLINGJ-'
.'&type_doc=1'
.'&disable_trailer=1'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=14')
->answers(json_encode(['url_trailer' => 'https://youtu.be/BEPO2',
@@ -751,13 +754,12 @@ class RecordsControllerTrailerAdministrationTest extends RecordsControllerTestCa
/** @test */
public function enableAcionshouldRedirectWithTrailerEnabledNotification() {
$this->_http_client
-
->whenCalled('open_url')
->with('http://cache.org'
.'?clef_oeuvre=HARRYPOTTER--ROWLINGJ-'
.'&type_doc=1'
.'&disable_trailer=0'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=14')
->answers(json_encode(['url_trailer' => 'https://youtu.be/BEPO2',
diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerPelliculeTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerPelliculeTest.php
index b7a5b703b7dc95d6efd3c17c118c4be68b41745e..bca8f8953857aef24f5b22d77ac1407f5da32cb6 100644
--- a/tests/application/modules/opac/controllers/NoticeAjaxControllerPelliculeTest.php
+++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerPelliculeTest.php
@@ -58,7 +58,7 @@ class NoticeAjaxControllerPelliculeActiveTest extends AbstractControllerTestCase
->whenCalled('open_url')
->answers(null);
- Class_WebService_AllServices::setHttpClient($this->_http_client);
+ Class_WebService_Afi::setHttpClient($this->_http_client);
$this->dispatch('/noticeajax/notice/id/1');
}
diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
index f045df6c1234ad43066c23b5568d8ce9fbb7f56b..491d976050c9dc2119cbba5a229e6cb33b7b97fa 100644
--- a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
+++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
@@ -457,28 +457,22 @@ class NoticeAjaxControllerBandeAnnonceTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
Class_CosmoVar::setValueOf('url_services', 'https://websvc.net/main.php');
- Class_WebService_AllServices::setHttpClient($this->mock()
- ->whenCalled('open_url')
- ->answers(json_encode(['source' => 'Testing',
- 'player' => 'toto'])));
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode(['source' => 'Testing',
+ 'player' => 'toto'])));
$this->fixture('Class_Notice',
['id' => 2,
'unimarc' => file_get_contents(ROOT_PATH . 'tests/fixtures/dvd_potter.uni'),
'clef_oeuvre' => 'POTTER',
'type_doc' => Class_TypeDoc::DVD]);
-
- }
-
- public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
- parent::tearDown();
}
/** @test */
public function responseShouldContainsSourceTitle() {
- $this->dispatch('noticeajax/bandeannonce/id/2', true);
+ $this->dispatch('/noticeajax/bandeannonce/id/2');
$this->assertXPathContentContains('//h3',
'Source : Testing',
$this->_response->getBody());
@@ -492,9 +486,10 @@ class NoticeAjaxControllerBandeAnnonceTest extends AbstractControllerTestCase {
['id' => 15,
'login'=>'someone',
'password' => 'is here',
- 'id_bib' => 3])->beAbonneSIGB());
+ 'id_bib' => 3])
+ ->beAbonneSIGB());
- $this->dispatch('noticeajax/bandeannonce/id/2', true);
+ $this->dispatch('/noticeajax/bandeannonce/id/2');
$this->assertNotXPath('//button');
}
@@ -508,23 +503,32 @@ class NoticeAjaxControllerBandeAnnonceTest extends AbstractControllerTestCase {
'password' => 'is here',
'id_bib' => 3])->beModoBib());
- $this->dispatch('noticeajax/bandeannonce/id/2', true);
+ $this->dispatch('/noticeajax/bandeannonce/id/2');
$this->assertXPath('//button[@data-popup="true"][contains(@data-url, "records/trailer/id/2")]');
}
/** @test */
public function harryPotterWith410DollarVShouldFindTrailer() {
- $key = Class_WebService_AllServices::createSecurityKey();
-
- Class_WebService_AllServices::setHttpClient(
- Storm_Test_ObjectWrapper::mock()
- ->whenCalled('open_url')
- ->with('https://websvc.net/main.php?titre=Harry+Potter+%C3%A0+l%27%C3%A9cole+des+sorciers&auteur=Chris+Columbus&clef_oeuvre=POTTER&type_doc=4&width=500&height=400&src=' . $key . '&api=2.0&action=6')
- ->answers(json_encode(['source' => 'CommeAuCinema', 'player' => '<iframe></iframe>']))
- ->beStrict());
-
- $this->dispatch('noticeajax/bandeannonce/id/2', true);
+ Class_WebService_Afi::setKey('SuperKey');
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->with('https://websvc.net/main.php'
+ . '?titre=Harry+Potter+%C3%A0+l%27%C3%A9cole+des+sorciers'
+ . '&auteur=Chris+Columbus'
+ . '&clef_oeuvre=POTTER'
+ . '&type_doc=4'
+ . '&width=500'
+ . '&height=400'
+ . '&src=SuperKey'
+ . '&api=2.0'
+ . '&action=6')
+ ->answers(json_encode(['source' => 'CommeAuCinema',
+ 'player' => '<iframe></iframe>']))
+ ->beStrict());
+
+
+ $this->dispatch('/noticeajax/bandeannonce/id/2');
$this->assertXPath('//iframe', $this->_response->getBody());
}
}
@@ -589,20 +593,23 @@ class NoticeAjaxControllerBibliographiesTest extends NoticeAjaxControllerLastFmT
class NoticeAjaxControllerInterviewsTest extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
/** @test */
public function responseH3ShouldContainsFrodoInterview() {
+ Class_CosmoVar::setValueOf('url_services', 'https://cache.net/main.php');
+
$this->fixture('Class_Notice', ['id' => 777])
->setAuteurPrincipal('Frodo')
- ->save();
+ ->assertSave();
- Class_WebService_AllServices::setHttpClient(
- Storm_Test_ObjectWrapper::mock()
- ->whenCalled('open_url')
- ->answers(json_encode(['source' => 'Testing',
- 'videos' => [['titre' => 'Frodo interview by M.Drucker',
- 'contenu' => '']]])));
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode(['source' => 'Testing',
+ 'videos' => [['titre' => 'Frodo interview by M.Drucker',
+ 'contenu' => '']]])));
- $this->dispatch('noticeajax/videos?id_notice=777', true);
+ $this->dispatch('noticeajax/videos?id_notice=777');
$this->assertXPathContentContains('//h3', 'Frodo interview by M.Drucker');
}
}
@@ -612,8 +619,6 @@ class NoticeAjaxControllerInterviewsTest extends AbstractControllerTestCase {
/** @see http://forge.afi-sa.fr/issues/16741 */
class NoticeAjaxControllerResumeGamWidgetTest extends AbstractControllerTestCase {
-
-
/** @test */
public function shouldDisplayGamWidget() {
$this->fixture('Class_Notice',
@@ -2038,6 +2043,8 @@ class NoticeAjaxControllerErrorTagsTest extends AbstractControllerTestCase {
abstract class NoticeAjaxControllerBiographieTestCase extends AbstractControllerTestCase {
+ protected $_storm_default_to_volatile = true;
+
public function setUp() {
parent::setUp();
@@ -2063,45 +2070,43 @@ abstract class NoticeAjaxControllerBiographieTestCase extends AbstractController
->with('J.K Rowling')
->answers(Class_CodifAuteur::find(12));
-
Class_CosmoVar::newInstanceWithId('url_services', ['valeur' => 'http://cache.org']);
$admin = Class_Users::newInstanceWithId(15,['login'=>'admin'])->beAdminPortail();
Zend_Auth::getInstance()->logUser($admin);
+
+ Class_WebService_Afi::setKey('SuperKey');
}
}
-class NoticeAjaxControllerBiographieTest extends NoticeAjaxControllerBiographieTestCase {
-
- protected $_storm_default_to_volatile = true;
-
+class NoticeAjaxControllerBiographieTest extends NoticeAjaxControllerBiographieTestCase {
public function setUp() {
parent::setUp();
Zend_Registry::get('translate')->setLocale('fr');
- Class_WebService_AllServices::setHttpClient($this->mock()
- ->whenCalled('open_url')
- ->with('http://cache.org'
- .'?auteur='.urlencode('J.K Rowling')
- .'&clef_oeuvre=HARRYPOTTER--ROWLINGJ-5'
- .'&language=fr'
- .'&src='.Class_WebService_AllServices::createSecurityKey()
- .'&api=2.0'
- .'&action=8')
-
- ->answers(json_encode(['statut_recherche' => '0',
- 'source' => 'Wikipedia',
- 'url_source' => 'https://fr.wikipedia.org/wiki/J._K._Rowling',
- 'vignette' => 'rowling.jpg',
- 'image' => 'rowling_big.jpg',
- 'biographie' => [
- ['texte' => 'Auteur de H.Potter']
- ]
- ]))
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->with('http://cache.org'
+ .'?auteur='.urlencode('J.K Rowling')
+ .'&clef_oeuvre=HARRYPOTTER--ROWLINGJ-5'
+ .'&language=fr'
+ .'&src=SuperKey'
+ .'&api=2.0'
+ .'&action=8')
+
+ ->answers(json_encode(['statut_recherche' => '0',
+ 'source' => 'Wikipedia',
+ 'url_source' => 'https://fr.wikipedia.org/wiki/J._K._Rowling',
+ 'vignette' => 'rowling.jpg',
+ 'image' => 'rowling_big.jpg',
+ 'biographie' => [
+ ['texte' => 'Auteur de H.Potter']
+ ]
+ ]))
->beStrict());
$this->dispatch('/opac/noticeajax/biographie/id_notice/23', true);
}
diff --git a/tests/application/modules/telephone/controllers/RechercheControllerHarryPotterTest.php b/tests/application/modules/telephone/controllers/RechercheControllerHarryPotterTest.php
index fe74c35b9172a5c03cdc75e74dfb82dae4257344..fca44bb2e389240683513b6729e070b91eaa97db 100644
--- a/tests/application/modules/telephone/controllers/RechercheControllerHarryPotterTest.php
+++ b/tests/application/modules/telephone/controllers/RechercheControllerHarryPotterTest.php
@@ -268,7 +268,9 @@ class Telephone_RechercheControllerHarryPotterTagsTest extends Telephone_Recherc
-class Telephone_RechercheControllerHarryPotterBiographieTest extends Telephone_RechercheControllerHarryPotterTestCase {
+class Telephone_RechercheControllerHarryPotterBiographieTest
+ extends Telephone_RechercheControllerHarryPotterTestCase {
+
public function setUp() {
parent::setUp();
$httpClient = $this->mock()
@@ -277,13 +279,7 @@ class Telephone_RechercheControllerHarryPotterBiographieTest extends Telephone_R
'source' => 'afi',
'url_source' => '',
'vignette' => '']));
- Class_WebService_AllServices::setHttpClient($httpClient);
- }
-
-
- public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
- parent::tearDown();
+ Class_WebService_Afi::setHttpClient($httpClient);
}
@@ -823,25 +819,23 @@ class Telephone_RechercheControllerHarryPotterAvisTest extends Telephone_Recherc
-class Telephone_RechercheControllerHarryPotterVideosTest extends Telephone_RechercheControllerHarryPotterTestCase {
+class Telephone_RechercheControllerHarryPotterVideosTest
+ extends Telephone_RechercheControllerHarryPotterTestCase {
+
public function setUp() {
parent::setUp();
+ $answer = ['statut_recherche' => 2,
+ 'erreur' => '',
+ 'source' => 'youtube',
+ 'video' => '<object width="500" height="400"><param name="movie" value="https://www.youtube.com/v/np9U1pmRsGs&fs=1&source=uds&autoplay=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="https://www.youtube.com/v/np9U1pmRsGs&fs=1&source=uds&autoplay=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="500" height="400"></embed></object>',
+ 'statut' => 'OK'];
- $answer = array('statut_recherche' => 2,
- 'erreur' => '',
- 'source' => 'youtube',
- 'video' => '<object width="500" height="400"><param name="movie" value="https://www.youtube.com/v/np9U1pmRsGs&fs=1&source=uds&autoplay=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="https://www.youtube.com/v/np9U1pmRsGs&fs=1&source=uds&autoplay=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="500" height="400"></embed></object>',
- 'statut' => 'OK');
-
- $http_client = Storm_Test_ObjectWrapper::mock();
- $http_client
- ->whenCalled('open_url')
- ->answers(json_encode($answer));
-
- Class_WebService_AllServices::setHttpClient($http_client);
-
+ $http_client = $this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode($answer));
+ Class_WebService_Afi::setHttpClient($http_client);
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseBatchsTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseBatchsTest.php
index a05d312d7c88996b37702028e9486f8a25bac305..b9e4431b9849e12ef90e26989499a282f1d2150b 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseBatchsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseBatchsTest.php
@@ -123,7 +123,12 @@ class PhaseBatchsCronRunTest extends PhaseBatchsTestCase {
/** @test */
public function shouldDisplayBatchLabel() {
- $this->assertLogContains('Testing Batch OK');
+ $expected = <<<'EOT'
+ <h4>Execution des batchs programmés</h4>
+ Testing Batch
+ OK
+EOT;
+ $this->assertLogContains($expected);
}
@@ -187,7 +192,13 @@ class PhaseBatchsCronRunWithLoggerTest extends PhaseBatchsTestCase {
/** @test */
public function shouldDisplayThrowingBatchErrorInBatchLog() {
- $this->assertLogContains('Erreur lors de l\'execution du batch ThrowingBatch Oh!');
+ $expected = <<<'EOT'
+ <h4>Execution des batchs programmés</h4>
+ ThrowingBatch
+ Erreur lors de l'execution du batch ThrowingBatch
+ Oh!
+EOT;
+ $this->assertLogContains($expected);
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseIncompleteRecordTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseIncompleteRecordTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..35bf0fab357949f9574c05b3aecfb44e5a9500d6
--- /dev/null
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseIncompleteRecordTest.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * Copyright (c) 2012-2021, 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
+ */
+
+
+abstract class PhaseIncompleteRecordTestCase extends Class_Cosmogramme_Integration_PhaseTestCase {
+ protected $_http_client, $_experiment;
+
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+
+ Class_CosmoVar::setValueOf('url_services', 'https://cache.myserver.org/api');
+ Class_CosmoVar::setValueOf('unimarc_zone_titre', '200$a;461$t');
+ Class_CosmoVar::setValueOf('mode_doublon', Class_CosmoVar::DOUBLE_SEARCH_ALPHA_KEY);
+ Class_CosmoVar::setValueOf('unicite_code_barres', Class_CosmoVar::UNIQ_BARCODE_ONLY);
+ Class_CosmoVar::setValueOf('Z3950_cache_only', 0);
+ Class_CosmoVar::setValueOf('Z3950_retry_level', 0);
+ Class_CosmoVar::setValueOf('z3950_max_reconnect', 3);
+ Class_CosmoVar::setValueOf('homogene_code_qualite', 10);
+ Class_CosmoVar::setValueOf('succintes_frequence', 2);
+
+ $this->_experiment = (new Class_NoticeUnimarc_Fluent)
+ ->zoneWithContent('001', 'FRBNF443112340000007')
+ ->zoneWithContent('003', 'http://catalogue.bnf.fr/ark:/12148/cb44311234v')
+ ->zoneWithChildren('020', ['a' => 'FR', 'b' => '71514057'])
+ ->zoneWithChildren('073', ['a' => '5052205070611'], ' 0')
+ ->zoneWithChildren('200', ['a' => 'The grand experiment'])
+ ->zoneWithChildren('210', ['c' => 'InsideOut music'])
+ ->zoneWithChildren('464', ['t' => 'The call'])
+ ->zoneWithChildren('700', ['a' => 'Morse', 'b' => 'Neal'])
+ ;
+
+ $data = ['unimarc' => $this->_experiment->render(),
+ 'type_doc' => 3,
+ 'id_origine' => '340054',
+ 'isbn' => '',
+ 'isbn10' => '',
+ 'isbn13' => '',
+ 'ean' => '5052205070611',
+ 'id_commerciale' => '',
+ 'clef_oeuvre' => 'THEGRANDEXPERIMENT--MORSEN-',
+ 'clef_alpha' => 'THEGRANDEXPERIMENT--MORSEN--INSIDEOUTMUSIC-2015-3',
+ 'clef_chapeau' => '',
+ 'titre_princ' => 'the grand experiment',
+ 'tome_alpha' => null,
+ 'qualite' => 5,
+ 'statut_exemplaires' => ['nb_ex' => 1,
+ 'nb_ex_detruits' => 0,
+ 'code_barres' => 0,
+ 'cotes' => 0],
+ 'exemplaires' =>
+ [["activite" => "peut être prêté",
+ "code_barres" => "711554",
+ "cote" => "2 MOR 4",
+ "emplacement" => "20",
+ "annexe" => "BLV",
+ "date_nouveaute" => "57032-09-10",
+ "zone995" => 'a:15:{i:0;a:2:{s:4:"code";s:1:"f";s:6:"valeur";s:6:"711554";}i:1;a:2:{s:4:"code";s:1:"w";s:6:"valeur";s:10:"2014-04-14";}i:2;a:2:{s:4:"code";s:1:"6";s:6:"valeur";s:1:"0";}i:3;a:2:{s:4:"code";s:1:"9";s:6:"valeur";s:6:"111127";}i:4;a:2:{s:4:"code";s:1:"c";s:6:"valeur";s:3:"BLV";}i:5;a:2:{s:4:"code";s:1:"2";s:6:"valeur";s:1:"0";}i:6;a:2:{s:4:"code";s:1:"k";s:6:"valeur";s:7:"2 MOR 4";}i:7;a:2:{s:4:"code";s:1:"5";s:6:"valeur";s:10:"2014-04-14";}i:8;a:2:{s:4:"code";s:1:"8";s:6:"valeur";s:4:"ROCK";}i:9;a:2:{s:4:"code";s:1:"o";s:6:"valeur";s:1:"0";}i:10;a:2:{s:4:"code";s:1:"e";s:6:"valeur";s:2:"RA";}i:11;a:2:{s:4:"code";s:1:"r";s:6:"valeur";s:2:"CD";}i:12;a:2:{s:4:"code";s:1:"4";s:6:"valeur";s:1:"0";}i:13;a:2:{s:4:"code";s:1:"b";s:6:"valeur";s:3:"BLV";}i:14;a:2:{s:4:"code";s:1:"z";s:6:"valeur";s:29:"Pôle Musique et Arts Vivants";}}'
+ ]]
+ ];
+
+ $morsen = $this->fixture(Class_NoticeSuccincte::class,
+ ['id' => 358,
+ 'id_bib' => 1,
+ 'profil' => 0,
+ 'data' => serialize($data),
+ 'z3950_retry' => 0,
+ 'date_creation' => '2014-09-02 02:17:41']);
+
+ $this->onLoaderOfModel(Class_NoticeSuccincte::class)
+ ->whenCalled('findAllBy')
+ ->with(['where' => 'z3950_retry <= 0 and id > 0',
+ 'order' => 'id',
+ 'limit' => 100])
+ ->answers([$morsen])
+
+ ->whenCalled('findAllBy')
+ ->answers([]);
+
+ $this->_http_client = $this->mock();
+ Class_WebService_Afi::setHttpClient($this->_http_client);
+ }
+
+
+ protected function _getPreviousPhase() {
+ return (new Class_Cosmogramme_Integration_Phase(3))->beCron();
+ }
+
+
+ public function setUp() {
+ parent::setUp();
+ $this->_phase = $this->_buildPhase('IncompleteRecord')->run();
+ Class_NoticeSuccincte::clearCache();
+ }
+
+
+ public function tearDown() {
+ Class_WebService_Afi::setHttpClient(null);
+ Class_Cosmogramme_Integration_PhaseIncompleteRecord::setTimeSource(null);
+ parent::tearDown();
+ }
+
+
+ /** @test */
+ public function logShouldContainsIntegrationDesNoticesSuccintes() {
+ $this->assertLogContains('Intégration des notices succintes');
+ }
+}
+
+
+
+
+class PhaseIncompleteRecordDelayNotExpiredTest extends PhaseIncompleteRecordTestCase {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ Class_CosmoVar::setValueOf('succintes_date', '2021-07-28');
+ Class_Cosmogramme_Integration_PhaseIncompleteRecord::setTimeSource(new TimeSourceForTest('2021-07-29'));
+ }
+
+
+ /** @test */
+ public function logShouldContainsSeraFaitDans2Jours() {
+ $this->assertLogContains('Sera fait dans 2 jours');
+ }
+}
+
+
+
+abstract class PhaseIncompleteRecordAtTimeOfRunning extends PhaseIncompleteRecordTestCase {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ Class_CosmoVar::setValueOf('succintes_date', '2021-07-14');
+ Class_Cosmogramme_Integration_PhaseIncompleteRecord::setTimeSource(new TimeSourceForTest('2021-07-29'));
+ }
+
+
+ protected function assertLogContainsReportLine($label, $count) {
+ $this->assertLogContains(sprintf('<td class="blank">%s</td><td class="blank" align="right">%s</td>',
+ $label, $count));
+ }
+
+
+ /** @test */
+ public function logShouldContainsNiveauDeTentativesDHomogeneisation0() {
+ $this->assertLogContains('Niveau de tentatives d\'homogénéisation : 0');
+ }
+
+
+ /** @test */
+ public function logShouldContains1NoticeTraitee() {
+ $this->assertLogContains('1 notice traitée');
+ }
+
+
+ /** @test */
+ public function logShouldContainsTempsDeTraitement() {
+ $this->assertLogContains('Temps de traitement');
+ }
+}
+
+
+
+
+class PhaseIncompleteRecordWithHttpErrorTest extends PhaseIncompleteRecordAtTimeOfRunning {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ $this->_http_client
+ ->whenCalled('open_url')
+ ->willDo(function()
+ {
+ throw new RuntimeException('timed out');
+ });
+ }
+
+
+ /** @test */
+ public function incompleteRecordShouldBeKept() {
+ $this->assertNotNull(Class_NoticeSuccincte::find(358));
+ }
+
+
+ /** @test */
+ public function recordShouldNotBeCreated() {
+ $this->assertNull(Class_Notice::findFirstBy(['ean' => '5052205070611']));
+ }
+
+
+ /** @test */
+ public function recordItemShouldNotBeCreated() {
+ $this->assertNull(Class_Exemplaire::findFirstBy(['id_origine' => '340054']));
+ }
+
+
+ public function messages() {
+ return [['Notices trouvées dans la base', 0],
+ ['Notices trouvées sur serveurs z39.50', 0],
+ ['Notices non trouvées', 0],
+ ['Échecs de connexions', 1]];
+ }
+
+
+ /**
+ * @test
+ * @dataProvider messages
+ */
+ public function logShouldContainsReportMessage($label, $count) {
+ $this->assertLogContainsReportLine($label, $count);
+ }
+}
+
+
+
+
+class PhaseIncompleteRecordFoundRemotlyTest extends PhaseIncompleteRecordAtTimeOfRunning {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ $this->_http_client
+ ->whenCalled('open_url')
+ ->answers(implode("\t",
+ ['statut=OK',
+ 'statut_z3950=3',
+ 'serveur=Bnf',
+ 'erreur=',
+ 'unimarc=' . $this->_experiment->render()]));
+ }
+
+
+ /** @test */
+ public function incompleteRecordShouldBeDeleted() {
+ $this->assertNull(Class_NoticeSuccincte::find(358));
+ }
+
+
+ /** @test */
+ public function recordShouldBeCreated() {
+ $this->assertNotNull(Class_Notice::findFirstBy(['ean' => '5052205070611']));
+ }
+
+
+ /** @test */
+ public function recordItemShouldBeCreated() {
+ $this->assertNotNull(Class_Exemplaire::findFirstBy(['id_origine' => '340054']));
+ }
+
+
+ public function messages() {
+ return [['Notices trouvées dans la base', 0],
+ ['Notices trouvées sur serveurs z39.50', 1],
+ ['Notices non trouvées', 0],
+ ['Échecs de connexions', 0]];
+ }
+
+
+ /**
+ * @test
+ * @dataProvider messages
+ */
+ public function logShouldContainsReportMessage($label, $count) {
+ $this->assertLogContainsReportLine($label, $count);
+ }
+}
+
+
+
+
+class PhaseIncompleteRecordNotFoundTest extends PhaseIncompleteRecordAtTimeOfRunning {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ $this->_http_client
+ ->whenCalled('open_url')
+ ->answers(implode("\t",
+ ['statut=OK',
+ 'statut_z3950=1']));
+ }
+
+
+ /** @test */
+ public function incompleteRecordShouldBeKept() {
+ $this->assertNotNull(Class_NoticeSuccincte::find(358));
+ }
+
+
+ /** @test */
+ public function recordShouldNotBeCreated() {
+ $this->assertNull(Class_Notice::findFirstBy(['ean' => '5052205070611']));
+ }
+
+
+ /** @test */
+ public function recordItemShouldNotBeCreated() {
+ $this->assertNull(Class_Exemplaire::findFirstBy(['id_origine' => '340054']));
+ }
+
+
+ public function messages() {
+ return [['Notices trouvées dans la base', 0],
+ ['Notices trouvées sur serveurs z39.50', 0],
+ ['Notices non trouvées', 1],
+ ['Échecs de connexions', 0]];
+ }
+
+
+ /**
+ * @test
+ * @dataProvider messages
+ */
+ public function logShouldContainsReportMessage($label, $count) {
+ $this->assertLogContainsReportLine($label, $count);
+ }
+}
+
+
+
+
+class PhaseIncompleteRecordFoundLocalyTest extends PhaseIncompleteRecordAtTimeOfRunning {
+ protected function _prepareFixtures() {
+ parent::_prepareFixtures();
+ $this->fixture(Class_Notice::class,
+ ['id' => 22,
+ 'type' => Class_Notice::TYPE_BIBLIOGRAPHIC,
+ 'type_doc' => Class_TypeDoc::DISQUE,
+ 'clef_alpha' => 'THEGRANDEXPERIMENT--MORSEN--INSIDEOUTMUSIC-2015-3']);
+ }
+
+
+ /** @test */
+ public function incompleteRecordShouldBeDeleted() {
+ $this->assertNull(Class_NoticeSuccincte::find(358));
+ }
+
+
+ /** @test */
+ public function recordItemShouldBeCreated() {
+ $this->assertNotNull(Class_Exemplaire::findFirstBy(['id_origine' => '340054']));
+ }
+
+
+ public function messages() {
+ return [['Notices trouvées dans la base', 1],
+ ['Notices trouvées sur serveurs z39.50', 0],
+ ['Notices non trouvées', 0],
+ ['Échecs de connexions', 0]];
+ }
+
+
+ /**
+ * @test
+ * @dataProvider messages
+ */
+ public function logShouldContainsReportMessage($label, $count) {
+ $this->assertLogContainsReportLine($label, $count);
+ }
+}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php b/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
index 629b55f3ec15d9358e1b6bbba6387815443c2f54..a705d9ebbfa4db10f37ef6d03c6d888f852db096 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
@@ -156,8 +156,13 @@ class PhaseItemFacetsExpectedExceptionPhaseTest extends PhaseItemFacetsTestCase
/** @test */
- public function logShouldContainsPhaseLabel() {
- $this->assertLogContains('<h4>Mise à jour des facettes exemplaires</h4> <span class="vert"> 0 records updated </span> <p class="rouge">Erreur lors de l\'execution de la phase Mise à jour des facettes exemplaires : <br/>Invalid argument supplied for foreach()');
+ public function logShouldContainsPhaseLabelWithInvalidArgumentError() {
+ $expected = <<<'EOT'
+ <h4>Mise à jour des facettes exemplaires</h4>
+ <span class="vert"> 0 records updated </span>
+ <p class="rouge">Erreur lors de l'execution de la phase Mise à jour des facettes exemplaires : <br/>Invalid argument supplied for foreach()
+EOT;
+ $this->assertLogContains($expected);
}
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php b/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
index 1242b7c831988b7ff6b67315cc37638da1202470..9890dbac2cf02173a8c871b6204b4a826e33fb4c 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhasePrepareIntegrationsTest.php
@@ -315,7 +315,7 @@ class PhasePrepareIntegrationsWithOAITest extends PhasePrepareIntegrationsWithOA
/** @test */
public function logShouldContainsFileTooSmall() {
- $this->assertLogContains('<td class="blank">foo/toosmall.txt</td><td class="blank"> Le fichier est trop petit : 1000000 o -> taille minimum attendue : 10485760 o');
+ $this->assertLogContains("<td class=\"blank\">foo/toosmall.txt</td><td class=\"blank\">\n Le fichier est trop petit : 1000000 o -> taille minimum attendue : 10485760 o");
}
@@ -708,7 +708,7 @@ class PhasePrepareIntegrationsNanookStandardTest
/** @test */
public function logShouldContainsStandardUpdateOk() {
- $this->assertContains('<h4>Mise à jour de l\'étalon</h4> OK', $this->_log_content);
+ $this->assertContains("<h4>Mise à jour de l'étalon</h4>\n OK", $this->_log_content);
}
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseTestCase.php b/tests/library/Class/Cosmogramme/Integration/PhaseTestCase.php
index 36d4ca493c5d2bedc970bee95fac7a24d8f70c47..c9f41f61f5c5ddf6194b461550bcc8a06e322303 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseTestCase.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseTestCase.php
@@ -37,7 +37,7 @@ abstract class Class_Cosmogramme_Integration_PhaseTestCase extends ModelTestCase
$this->_log = $this->mock();
$append_log = function($content) {
- $this->_log_content .= ' ' . $content;
+ $this->_log_content .= ' ' . $content . "\n";
return $this->_log;
};
@@ -71,11 +71,9 @@ abstract class Class_Cosmogramme_Integration_PhaseTestCase extends ModelTestCase
protected function _buildPhase($name) {
$class_name = 'Class_Cosmogramme_Integration_Phase' . ucfirst($name);
- return (new $class_name($this->_getPreviousPhase(),
- $this->_log,
- $this->_chrono))
- ->setPrinter($this->_printer)
- ->setMemoryCleaner(function() { });
+ return (new $class_name($this->_getPreviousPhase(), $this->_log, $this->_chrono))
+ ->setPrinter($this->_printer)
+ ->setMemoryCleaner(function() { });
}
diff --git a/tests/library/Class/NoticeTest.php b/tests/library/Class/NoticeTest.php
index 27b66076346771be2f696676235ccbaea499f4bf..0d4768e7afe55a0a91faa1d2f98f4269841b19c0 100644
--- a/tests/library/Class/NoticeTest.php
+++ b/tests/library/Class/NoticeTest.php
@@ -18,19 +18,21 @@
* along with BOKEH; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
class NoticeVignetteTest extends ModelTestCase {
- protected $_storm_default_to_volatile = true;
+ protected $_http_client;
public function setUp() {
parent::setUp();
- $this->_http_client = Storm_Test_ObjectWrapper::mock();
- $this->_http_client
- ->whenCalled('open_url')
- ->answers(json_encode(['vignette' => 'from_cache_small.jpg',
- 'image' => 'from_cache_big.jpg',
- 'statut_recherche' => 2]));
- Class_WebService_AllServices::setHttpClient($this->_http_client);
+ $this->_http_client = $this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode(['vignette' => 'from_cache_small.jpg',
+ 'image' => 'from_cache_big.jpg',
+ 'statut_recherche' => 2]));
+
+ Class_WebService_Afi::setHttpClient($this->_http_client);
+ Class_WebService_Afi::setKey('SuperKey');
Class_WebService_Vignette::setDefaultHttpClient($this->_http_client);
@@ -49,14 +51,12 @@ class NoticeVignetteTest extends ModelTestCase {
'url_vignette' => 'NO',
'url_image' => 'NO']);
-
$this->_notice_with_thumbnails = $this->fixture('Class_Notice',
['id' => 3,
'type_doc' => Class_TypeDoc::LIVRE,
'url_vignette' => 'tintin_small.jpg',
'url_image' => 'tintin.jpg']);
-
$this->_notice_article_without_thumbnails = $this->fixture('Class_Notice',
['id' => 4,
'type_doc' => Class_TypeDoc::ARTICLE,
@@ -70,8 +70,6 @@ class NoticeVignetteTest extends ModelTestCase {
'titre' => 'Je suis Spirou',
'contenu' => 'avec mon copain le <img src="marsu.jpg"> marsupilami']);
-
-
$this->_notice_site_without_thumbnails = $this->fixture('Class_Notice',
['id' => 5,
'type_doc' => Class_TypeDoc::SITE,
@@ -86,8 +84,6 @@ class NoticeVignetteTest extends ModelTestCase {
'type_doc' => Class_TypeDoc::DISQUE,
'url_image' => '']);
-
-
$preferences= [ 'thumbnail_fields' => '700-a;856-u'];
$this->fixture('Class_Profil',
['id' => 1,
@@ -102,7 +98,6 @@ class NoticeVignetteTest extends ModelTestCase {
'titre' => 'LinuxFR',
'url' => 'http://www.linuxfr.org']);
-
$this->_serial_without_thumbnails = $this->fixture('Class_Notice',
['id' => 9,
'type_doc' => Class_TypeDoc::PERIODIQUE,
@@ -116,7 +111,8 @@ class NoticeVignetteTest extends ModelTestCase {
public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
+ Class_WebService_Afi::setHttpClient(null);
+ Class_WebService_Afi::setKey(null);
Class_WebService_Vignette::setDefaultHttpClient(null);
Class_Article::setFileWriter(null);
parent::tearDown();
@@ -140,7 +136,6 @@ class NoticeVignetteTest extends ModelTestCase {
}
-
/** @test */
public function serialWithThumbnailFetchUrlLocalVignetteShouldCallServiceAndSetUrlVignette() {
$thumb_url = 'https//server.ext/img/thumb/diplo.jpg';
@@ -153,7 +148,7 @@ class NoticeVignetteTest extends ModelTestCase {
.'&type_doc=2'
.'&numero=123'
.'&clef_chapeau='.urlencode('Monde Diplo')
- .'&src='.Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0'
.'&action=10')
@@ -873,8 +868,9 @@ class NoticeStromaeTest extends ModelTestCase {
class NoticeWithSerialArticleTest extends AbstractControllerTestCase {
-
- protected $_articles;
+ protected
+ $_storm_default_to_volatile = true,
+ $_articles;
public function setUp() {
parent::setUp();
@@ -935,7 +931,7 @@ class NoticeWithSerialArticleTest extends AbstractControllerTestCase {
class NoticeGetChampNoticeTest extends ModelTestCase {
- protected $_storm_default_to_volatile = true,
+ protected
$_record,
$_facets;
@@ -964,8 +960,7 @@ class NoticeGetChampNoticeTest extends ModelTestCase {
class NoticeUpdateFacetsFromItemsTest extends ModelTestCase {
- protected $_storm_default_to_volatile = true,
- $_record;
+ protected $_record;
public function setUp() {
parent::setUp();
@@ -1019,9 +1014,6 @@ class NoticeUpdateFacetsFromItemsTest extends ModelTestCase {
class NoticeGetMatieresTest extends ModelTestCase {
- protected $_storm_default_to_volatile = true;
-
-
/** @test */
public function shouldReturnMatieres() {
Class_CosmoVar::set('unimarc_zone_matiere',
diff --git a/tests/library/Class/WebService/CacheServerTest.php b/tests/library/Class/WebService/CacheServerTest.php
index 777908b2d3d8b762585ee571c8eab9f5edd59721..576eeac868fa58c973ba6c3f2d6c7ec94cbcc69c 100644
--- a/tests/library/Class/WebService/CacheServerTest.php
+++ b/tests/library/Class/WebService/CacheServerTest.php
@@ -28,7 +28,13 @@ abstract class Class_WebService_CacheServerTestCase extends ModelTestCase {
public function setUp() {
parent::setUp();
Class_CosmoVar::set('url_services', 'http://cache.server.org/');
- Class_WebService_AllServices::setHttpClient($this->_http = $this->mock());
+ Class_WebService_Afi::setHttpClient($this->_http = $this->mock());
+ }
+
+
+ public function tearDown() {
+ Class_WebService_Afi::setHttpClient(null);
+ parent::tearDown();
}
@@ -40,13 +46,14 @@ abstract class Class_WebService_CacheServerTestCase extends ModelTestCase {
->zoneWithChildren('461', ['v' => '5'])
->zoneWithChildren('700', ['a' => 'Pratchett', 'b' => 'Terry']);
- Class_Notice::newInstance(['id' => 23,
- 'unimarc' => $unimarc->render(),
- 'type_doc' => 1,
- 'clef_oeuvre' => 'SOURCELLERIE-PRATCHETTT',
- 'facettes' => ''])
- ->assertSave();
- $this->fixture('Class_CodifAuteur',
+ $this->fixture(Class_Notice::class,
+ ['id' => 23,
+ 'unimarc' => $unimarc->render(),
+ 'type_doc' => 1,
+ 'clef_oeuvre' => 'SOURCELLERIE-PRATCHETTT',
+ 'facettes' => '']);
+
+ $this->fixture(Class_CodifAuteur::class,
['id' => 10,
'libelle' => 'Pratchett Terry',
'formes' => 'PRATCHETTxTERRY']);
@@ -59,11 +66,12 @@ abstract class Class_WebService_CacheServerTestCase extends ModelTestCase {
protected function _expectOpenUrlWithStatutRecherche() {
- $this->_http->whenCalled('open_url')->willDo(function($url)
- {
- $this->_cache_url = $url;
- return '{"statut_recherche": "2"}';
- });
+ $this->_http->whenCalled('open_url')
+ ->willDo(function($url)
+ {
+ $this->_cache_url = $url;
+ return '{"statut_recherche": "2"}';
+ });
}
}
@@ -74,7 +82,6 @@ class Class_WebService_CacheServerUnknownResponseTest
extends Class_WebService_CacheServerTestCase {
protected
- $_storm_default_to_volatile = true,
$_response,
$_inspector;
@@ -91,13 +98,13 @@ class Class_WebService_CacheServerUnknownResponseTest
->whenCalled('logError')
->answers(null);
- Class_WebService_AllServices::setInspector($this->_inspector);
+ Class_WebService_Afi::setInspector($this->_inspector);
$this->_response = Class_WebService_AllServices::runServiceAfiInterviews([]);
}
public function tearDown() {
- Class_WebService_AllServices::setInspector(null);
+ Class_WebService_Afi::setInspector(null);
parent::tearDown();
}
@@ -164,6 +171,7 @@ class Class_WebService_CacheServerAuthorDescriptionTest
Zend_Registry::set('sql', $this->mock()
->whenCalled('fetchAll')
->answers([[456, 'A10']]));
+
$this->_http->whenCalled('open_url')
->willDo(function($url)
{
diff --git a/tests/library/Class/WebService/VignetteTest.php b/tests/library/Class/WebService/VignetteTest.php
index 768f97aaa21048fb0d5130bb255351b680133d0a..8ba34f3d4a92d29bad6f6a68d7252f0782af16e3 100644
--- a/tests/library/Class/WebService/VignetteTest.php
+++ b/tests/library/Class/WebService/VignetteTest.php
@@ -20,23 +20,19 @@
*/
class Class_WebService_VignetteNoticeTest extends ModelTestCase {
- protected $_storm_default_to_volatile = true;
-
public function setUp() {
parent::setUp();
- $http_client = $this->mock();
-
- $this->fixture('Class_Profil',
+ $this->fixture(Class_Profil::class,
['id' => 1, 'libelle' => 'default profil'])
->beCurrentProfil();
- $this->fixture('Class_CodifTypeDoc',
+ $this->fixture(Class_CodifTypeDoc::class,
['id' => 102,
'type_doc_id'=> 102,
'famille_id' => Class_CodifTypeDoc::LIVRE]);
- $this->fixture('Class_Notice',
+ $this->fixture(Class_Notice::class,
['id'=> 10,
'titre_principal' => 'Le photographe',
'auteur_principal' => 'Guibert',
@@ -44,26 +40,27 @@ class Class_WebService_VignetteNoticeTest extends ModelTestCase {
'ean' => '1111111',
'type_doc' => 102]);
- Class_WebService_AllServices::setHttpClient($http_client);
-
- Class_CosmoVar::newInstanceWithId('url_services')->setValeur('http://cache.org');
- $http_client
- ->whenCalled('open_url')
- ->with('http://cache.org?'
- .'titre=Le+photographe'
- .'&auteur=Guibert'
- .'&isbn=3222222'
- .'&ean=1111111'
- .'&type_doc=1'
- .'&numero='
- .'&src='.Class_WebService_AllServices::createSecurityKey()
- .'&api=2.0'
- .'&action=10')
-
- ->answers(json_encode(['vignette' => 'http://cache.org/potter_thumb.jpg',
- 'image' => 'http://cache.org/potter.jpg',
- 'statut_recherche' => 2]))
- ->beStrict();
+ Class_CosmoVar::set('url_services', 'http://cache.org');
+
+ Class_WebService_Afi::setKey('SuperKey');
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->with('http://cache.org?'
+ .'titre=Le+photographe'
+ .'&auteur=Guibert'
+ .'&isbn=3222222'
+ .'&ean=1111111'
+ .'&type_doc=1'
+ .'&numero='
+ .'&src=SuperKey'
+ .'&api=2.0'
+ .'&action=10')
+
+ ->answers(json_encode(['vignette' => 'http://cache.org/potter_thumb.jpg',
+ 'image' => 'http://cache.org/potter.jpg',
+ 'statut_recherche' => 2]))
+ ->beStrict());
+
(new Class_WebService_Vignette())
->updateUrlsFromCacheServer(Class_Notice::find(10));
@@ -71,7 +68,7 @@ class Class_WebService_VignetteNoticeTest extends ModelTestCase {
public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
+ Class_WebService_Afi::setHttpClient(null);
parent::tearDown();
}
@@ -94,23 +91,19 @@ class Class_WebService_VignetteNoticeTest extends ModelTestCase {
class Class_WebService_VignetteWrongFrbrTest extends ModelTestCase {
- protected $_storm_default_to_volatile = true;
-
public function setUp() {
parent::setUp();
- $http_client = $this->mock();
-
- $this->fixture('Class_Profil',
+ $this->fixture(Class_Profil::class,
['id' => 1, 'libelle' => 'default profil'])
->beCurrentProfil();
- $this->fixture('Class_CodifTypeDoc',
+ $this->fixture(Class_CodifTypeDoc::class,
['id' => 102,
'type_doc_id'=> 102,
'famille_id' => Class_CodifTypeDoc::LIVRE]);
- $this->fixture('Class_Notice',
+ $this->fixture(Class_Notice::class,
['id'=> 10,
'titre_principal' => 'Le photographe',
'auteur_principal' => 'Guibert',
@@ -119,27 +112,25 @@ class Class_WebService_VignetteWrongFrbrTest extends ModelTestCase {
'clef_alpha' => 'LEPHOOGRAPHE--GUIBERT---2004-1',
'type_doc' => 102]);
- $album = $this->fixture('Class_Album',
+ $album = $this->fixture(Class_Album::class,
['id' => 42,
'titre' => 'Aces High',
'fichier' => 'potter.jpg',
'type_doc_id' => Class_TypeDoc::AUDIO_RECORD]);
- $this->fixture('Class_FRBR_Link',
+ $this->fixture(Class_FRBR_Link::class,
['id' => 1,
'type_id' => 1,
'source' => 'http://localhost' . BASE_URL . '/recherche/viewnotice/clef/LEPHOOGRAPHE--GUIBERT---2004-1',
'target' => 'http://localhost' . BASE_URL . '/bib-numerique/notice/id/43']);
- $this->fixture('Class_FRBR_Link',
+ $this->fixture(Class_FRBR_Link::class,
['id' => 2,
'type_id' => 1,
'source' => 'http://localhost' . BASE_URL . '/recherche/viewnotice/clef/LEPHOOGRAPHE--GUIBERT---2004-1',
'target' => 'http://localhost' . BASE_URL . '/bib-numerique/notice/id/42']);
- Class_WebService_AllServices::setHttpClient($http_client);
-
$image = $this->mock()
->whenCalled('thumbnailImage')
->with(500, 500, true, false)
@@ -151,8 +142,6 @@ class Class_WebService_VignetteWrongFrbrTest extends ModelTestCase {
->beStrict();
-
- Class_CosmoVar::newInstanceWithId('url_services')->setValeur('http://cache.org');
$image_factory = $this->mock()
->whenCalled('newImage')
->answers($image);
@@ -164,14 +153,8 @@ class Class_WebService_VignetteWrongFrbrTest extends ModelTestCase {
}
- public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
- parent::tearDown();
- }
-
-
/** @test */
- public function vignetShouldReturnLePhotgrapheJpg() {
+ public function urlVignetteShouldBeLePhotgrapheJpg() {
$this->assertEquals('/temp/vignettes_titre/LEPHOOGRAPHE--GUIBERT---2004-1.jpg',
Class_Notice::find(10)->getUrlVignette());
}
diff --git a/tests/library/ZendAfi/View/Helper/BiographieTest.php b/tests/library/ZendAfi/View/Helper/BiographieTest.php
index 7d3b12c1a1128aec77fe78a32e970ea486f5bbc0..fbc62df31e815944375de23da1541fcc154a9fa9 100644
--- a/tests/library/ZendAfi/View/Helper/BiographieTest.php
+++ b/tests/library/ZendAfi/View/Helper/BiographieTest.php
@@ -27,10 +27,9 @@ abstract class ZendAfi_View_Helper_BiographieTestCase extends ViewHelperTestCase
parent::setUp();
Class_CosmoVar::setValueOf('url_services', 'http://cache.org/');
- $http_client = $this->mock()
- ->whenCalled('open_url')
- ->answers(json_encode($this->_serviceResponse()));
- Class_WebService_AllServices::setHttpClient($http_client);
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode($this->_serviceResponse())));
$unimarc = (new Class_NoticeUnimarc_Fluent)
->zoneWithContent('001', '23')
@@ -39,7 +38,7 @@ abstract class ZendAfi_View_Helper_BiographieTestCase extends ViewHelperTestCase
->zoneWithChildren('461', ['v' => '5'])
->zoneWithChildren('700', ['a' => 'Rowling', 'b' => 'J.K']);
- $this->fixture('Class_CodifAuteur',
+ $this->fixture(Class_CodifAuteur::class,
['id' => 12,
'libelle' => 'J.K Rowling']);
@@ -53,12 +52,6 @@ abstract class ZendAfi_View_Helper_BiographieTestCase extends ViewHelperTestCase
}
- public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
- parent::tearDown();
- }
-
-
protected function _serviceResponse() {
return ['source' => 'wiki',
'url_source' => '',
diff --git a/tests/scenarios/AuthorPage/AuthorPageTest.php b/tests/scenarios/AuthorPage/AuthorPageTest.php
index d2e6f721a98b8993980f34ebaadd7ab4bd69b72d..6f43516134205806e1d7352940638453f7467bb9 100644
--- a/tests/scenarios/AuthorPage/AuthorPageTest.php
+++ b/tests/scenarios/AuthorPage/AuthorPageTest.php
@@ -92,14 +92,14 @@ abstract class AuthorPageTestCase extends AbstractControllerTestCase {
[10, 'A2408 A3']]);
Zend_Registry::set('sql', $this->mock_sql);
-
- Class_CosmoVar::newInstanceWithId('url_services')->setValeur('http://cache.org');
- Class_WebService_AllServices::setHttpClient($this->_http_client = $this->mock());
+ Class_CosmoVar::setValueOf('url_services', 'http://cache.org');
+ Class_WebService_Afi::setHttpClient($this->_http_client = $this->mock());
+ Class_WebService_Afi::setKey('SuperKey');
$this->_http_client
->whenCalled('open_url')
->with('http://cache.org?auteur=Victor+Hugo&clef_oeuvre=GAVROCHE--HUGOV-5&language=fr'
- .'&src=' . Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0&action=8')
->answers(json_encode(['statut_recherche' => 2,
'erreur' => '',
@@ -115,6 +115,13 @@ abstract class AuthorPageTestCase extends AbstractControllerTestCase {
'biography_disabled' => 0]))
->beStrict();
}
+
+
+ public function tearDown() {
+ Class_WebService_Afi::setHttpClient(null);
+ Class_WebService_Afi::setKey(null);
+ parent::tearDown();
+ }
}
@@ -126,7 +133,7 @@ class AuthorPageViewAuthorWithDisabledBiography extends AuthorPageTestCase {
$this->_http_client
->whenCalled('open_url')
->with('http://cache.org?auteur=Victor+Hugo&clef_oeuvre=GAVROCHE--HUGOV-5&language=fr'
- .'&src=' . Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0&action=8')
->answers(json_encode(['statut_recherche' => 2,
'erreur' => '',
@@ -168,7 +175,7 @@ class AuthorPageViewAuthorWithoutBiography extends AuthorPageTestCase {
$this->_http_client
->whenCalled('open_url')
->with('http://cache.org?auteur=Victor+Hugo&clef_oeuvre=GAVROCHE--HUGOV-5&language=fr'
- .'&src=' . Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0&action=8')
->answers(json_encode(['statut_recherche' => 0,
'erreur' => '',
@@ -471,12 +478,11 @@ class AuthorPageViewByIdTest extends AuthorPageTestCase {
class AuthorPageViewByIdWithNoImageTest extends AuthorPageTestCase {
public function setUp() {
parent::setUp();
- Class_WebService_AllServices::setHttpClient($this->_http_client = $this->mock());
$this->_http_client
->whenCalled('open_url')
->with('http://cache.org?auteur=Victor+Hugo&clef_oeuvre=GAVROCHE--HUGOV-5&language=fr'
- .'&src=' . Class_WebService_AllServices::createSecurityKey()
+ .'&src=SuperKey'
.'&api=2.0&action=8')
->answers(json_encode(['statut_recherche' => 2,
'erreur' => '',
@@ -638,11 +644,11 @@ class AuthorPageViewRecordWithoutAuthorTest extends AuthorPageTestCase {
$this->fixture('Class_Notice', ['id' => 999, 'titre_principal' => 'Les contacteurs']);
- $this->_http_client->whenCalled('open_url')
- ->with('http://cache.org?titre=Les+contacteurs&auteur=&type_doc=0&numero=&src='
- . Class_WebService_AllServices::createSecurityKey()
- . '&api=2.0&action=10')
- ->answers(false);
+ $this->_http_client
+ ->whenCalled('open_url')
+ ->with('http://cache.org?titre=Les+contacteurs&auteur=&type_doc=0&numero=&src=SuperKey'
+ . '&api=2.0&action=10')
+ ->answers(false);
$this->dispatch('/recherche/viewnotice/id/999');
}
@@ -658,9 +664,6 @@ class AuthorPageViewRecordWithoutAuthorTest extends AuthorPageTestCase {
class AuteurPageNoticeAjaxRenderYoutubeChannelTest extends AuthorPageTestCase {
- protected $_storm_default_to_volatile = true;
-
-
public function setUp() {
parent::setUp();
Class_CodifAuteur::find(2408)
@@ -708,10 +711,8 @@ class AuteurPageNoticeAjaxRenderYoutubeChannelTest extends AuthorPageTestCase {
-class AuteurPageNoticeAjaxRenderYoutubeChannelTarteAuCitronTest extends AuthorPageTestCase {
- protected $_storm_default_to_volatile = true;
-
+class AuteurPageNoticeAjaxRenderYoutubeChannelTarteAuCitronTest extends AuthorPageTestCase {
public function setUp() {
parent::setUp();
Class_AdminVar_Cookies::setManager(new Class_Cookies_TarteAuCitron());
@@ -751,4 +752,4 @@ class AuteurPageNoticeAjaxRenderYoutubeChannelTarteAuCitronTest extends AuthorPa
public function playlist441TitleShouldBePresent() {
$this->assertXPathContentContains('//h3', 'David Guetta Playlist 441');
}
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/AuthorPage/AuthorWidgetTest.php b/tests/scenarios/AuthorPage/AuthorWidgetTest.php
index 309c0605d6767528520c758f9f5981e1e950a6a9..180402c55e8423bc38e6803bc63227c1698705b8 100644
--- a/tests/scenarios/AuthorPage/AuthorWidgetTest.php
+++ b/tests/scenarios/AuthorPage/AuthorWidgetTest.php
@@ -108,8 +108,9 @@ class AuthorWidgetActionRefreshThumbnailsTest extends AuthorWidgetOnPageTestCase
->whenCalled('fetchAll')
->answers([[9, 'A2408 M6 A4']]);
Zend_Registry::set('sql', $mock_sql);
- Class_CosmoVar::newInstanceWithId('url_services')->setValeur('http://cache.org');
- Class_WebService_AllServices::setHttpClient($http_client = $this->mock());
+
+ Class_CosmoVar::set('url_services', 'http://cache.org');
+ Class_WebService_Afi::setHttpClient($http_client = $this->mock());
$http_client
->whenCalled('open_url')
diff --git a/tests/scenarios/Templates/ChiliRecordMediaTest.php b/tests/scenarios/Templates/ChiliRecordMediaTest.php
index 1a7e26f37a0d5a8a9c301b1dde459ac890f72090..214999050a76a9d8631ea91df8e71268bd9fdaad 100644
--- a/tests/scenarios/Templates/ChiliRecordMediaTest.php
+++ b/tests/scenarios/Templates/ChiliRecordMediaTest.php
@@ -28,7 +28,7 @@ class ChiliRecordMediaDispatchTest extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
- $this->fixture('Class_TypeDoc',
+ $this->fixture(Class_TypeDoc::class,
['id' => 3,
'label' => 'disc',
'famille_id' => Class_CodifTypeDoc::SONORE
@@ -46,7 +46,7 @@ class ChiliRecordMediaDispatchTest extends AbstractControllerTestCase {
->zoneWithChildren('464', ['t' => 'Spirits From Tuva',
'3' => 'https://ma-discotheque.org/Hunn-Huur-Tu/song']);
- $record = $this->fixture('Class_Notice',
+ $record = $this->fixture(Class_Notice::class,
['id' => 456,
'titre_principal' => 'Beethoven pour les petits maestros',
'unimarc' => $unimarc->render(),
@@ -83,14 +83,11 @@ class ChiliRecordMediaDispatchTest extends AbstractControllerTestCase {
Class_CosmoVar::set('url_services', 'https://cache-server.org');
- $mock = $this
- ->mock()
- ->whenCalled('open_url')
- ->answers(json_encode(['source' => 'testing',
- 'player' => '<iframe src="https://www.super-trailers.org/?media=18397590" style="width:500px; height:400px" frameborder="0"></iframe>']));
-
- Class_WebService_AllServices::setHttpClient($mock);
-
+ Class_WebService_Afi::setHttpClient($this
+ ->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode(['source' => 'testing',
+ 'player' => '<iframe src="https://www.super-trailers.org/?media=18397590" style="width:500px; height:400px" frameborder="0"></iframe>'])));
$this->dispatch('/opac/noticeajax/media/id/456');
}
diff --git a/tests/scenarios/Templates/TemplatesAuthorTest.php b/tests/scenarios/Templates/TemplatesAuthorTest.php
index 928f9e7c9359f147985aa49a14a55d74c8a8ec45..b995b851ff97b0414b26ef5383379e8d5c9cd423 100644
--- a/tests/scenarios/Templates/TemplatesAuthorTest.php
+++ b/tests/scenarios/Templates/TemplatesAuthorTest.php
@@ -74,11 +74,9 @@ abstract class TemplatesIntonationWithAuthorTest extends TemplatesIntonationTest
public function setUp() {
parent::setUp();
- $this->fixture('Class_CosmoVar',
- ['id' => 'url_services',
- 'valeur' => 'http://cache.org/']);
+ Class_CosmoVar::set('url_services', 'http://cache.org/');
- Class_WebService_AllServices::setHttpClient($this->_http_client = $this->mock());
+ Class_WebService_Afi::setHttpClient($this->_http_client = $this->mock());
$unimarc = (new Class_NoticeUnimarc_Fluent)
->zoneWithContent('001', '12345')
@@ -101,13 +99,8 @@ abstract class TemplatesIntonationWithAuthorTest extends TemplatesIntonationTest
->whenCalled('fetchAll')
->with("select id_notice, facettes from notices Where (MATCH(facettes) AGAINST('+A10' IN BOOLEAN MODE)) and type=1", true, false)
->answers([[456, 'G13 M12 A10']]);
- Zend_Registry::set('sql', $this->mock_sql);
- }
-
- public function tearDown() {
- Class_WebService_AllServices::setHttpClient(null);
- parent::tearDown();
+ Zend_Registry::set('sql', $this->mock_sql);
}
}
diff --git a/tests/scenarios/Templates/TemplatesDigitalResourcesTest.php b/tests/scenarios/Templates/TemplatesDigitalResourcesTest.php
index 4ea17880f1619f6af6c463fd961df43f44612e46..808327b6a99891d25620af8b366caa66019944f1 100644
--- a/tests/scenarios/Templates/TemplatesDigitalResourcesTest.php
+++ b/tests/scenarios/Templates/TemplatesDigitalResourcesTest.php
@@ -79,7 +79,6 @@ class TemplatesDigitalResourcesMediaAndTrailerDispatchTest extends AbstractContr
public function setUp() {
parent::setUp();
-
$this->_buildTemplateProfil(['id' => 5,
'template' => 'CHILI']);
@@ -90,13 +89,18 @@ class TemplatesDigitalResourcesMediaAndTrailerDispatchTest extends AbstractContr
Class_CosmoVar::set('url_services', 'https://cache-server.org');
- $mock = $this
- ->mock()
+ $mock = $this->mock()
->whenCalled('open_url')
->answers(json_encode(['source' => 'testing',
'player' => '<iframe src="https://www.super-trailers.org/?media=18397590" style="width:500px; height:400px" frameborder="0"></iframe>']));
- Class_WebService_AllServices::setHttpClient($mock);
+ Class_WebService_Afi::setHttpClient($mock);
+ }
+
+
+ public function tearDown() {
+ Class_WebService_Afi::setHttpClient(null);
+ parent::tearDown();
}
@@ -304,7 +308,8 @@ class TemplatesDigitalResourcesWrongIndexationTest extends AbstractControllerTes
-abstract class TemplatesDigitalResourcesTrailerAdministrationTestCase extends AbstractControllerTestCase {
+abstract class TemplatesDigitalResourcesTrailerAdministrationTestCase
+ extends AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
@@ -327,23 +332,42 @@ abstract class TemplatesDigitalResourcesTrailerAdministrationTestCase extends Ab
Class_CosmoVar::set('url_services', 'https://cache-server.org');
- $mock_web = $this->mock()
+ $this->_prepareHttpCalls();
+
+ $this->dispatch('/noticeajax/media/id/34');
+ }
+
- ->whenCalled('open_url')
- ->answers(json_encode(['source' => 'test_bokeh',
- 'disable_trailer' => $this->_is_trailer_disabled,
- 'player' => '<iframe src="https://www.super-trailers.org/?media=18397590" style="width:500px; height:400px" frameborder="0"></iframe>']));
+ protected function _prepareHttpCalls() {
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode(['source' => 'test_bokeh',
+ 'disable_trailer' => $this->_is_trailer_disabled,
+ 'player' => '<iframe src="https://www.super-trailers.org/?media=18397590" style="width:500px; height:400px" frameborder="0"></iframe>'])));
- Class_WebService_AllServices::setHttpClient($mock_web);
+ Intonation_Library_LastFm::setWebClient($this->mock()
+ ->whenCalled('getResponse')
+ ->with('https://www.last.fm/music/M./Psycho')
+ ->answers('')
- $this->dispatch('/noticeajax/media/id/34');
+ ->whenCalled('getResponse')
+ ->with('https://www.last.fm/music/M./+images/')
+ ->answers(''));
+ }
+
+
+ public function tearDown() {
+ Class_WebService_Afi::setHttpClient(null);
+ Intonation_Library_LastFm::setWebClient(null);
+ parent::tearDown();
}
}
-class TemplatesDigitalResourcesTrailerEnabledAdministrationTest extends TemplatesDigitalResourcesTrailerAdministrationTestCase {
+class TemplatesDigitalResourcesTrailerEnabledAdministrationTest
+ extends TemplatesDigitalResourcesTrailerAdministrationTestCase {
protected $_is_trailer_disabled = 0;
@@ -369,7 +393,8 @@ class TemplatesDigitalResourcesTrailerEnabledAdministrationTest extends Template
-class TemplatesDigitalResourcesTrailerDisabledAdministrationTest extends TemplatesDigitalResourcesTrailerAdministrationTestCase {
+class TemplatesDigitalResourcesTrailerDisabledAdministrationTest
+ extends TemplatesDigitalResourcesTrailerAdministrationTestCase {
protected $_is_trailer_disabled = 1;
@@ -395,6 +420,40 @@ class TemplatesDigitalResourcesTrailerDisabledAdministrationTest extends Templat
+class TemplatesDigitalResourcesTrailerEmptyPlayerAdministrationTest
+ extends TemplatesDigitalResourcesTrailerAdministrationTestCase {
+
+ protected function _prepareHttpCalls() {
+ parent::_prepareHttpCalls();
+ Class_WebService_Afi::setHttpClient($this->mock()
+ ->whenCalled('open_url')
+ ->answers(json_encode(['source' => '',
+ 'disable_trailer' => 1,
+ 'player' => ''])));
+ }
+
+
+ /** @test */
+ public function linkToEditTrailerShouldNotBePresent() {
+ $this->assertNotXPath('//button[@data-url = "/admin/records/trailer/id/34"]');
+ }
+
+
+ /** @test */
+ public function linkToEnableTrailerShouldBePresent() {
+ $this->assertXPath('//button[@data-url = "/admin/records/enable-trailer/id/34"]');
+ }
+
+
+ /** @test */
+ public function trailerShouldNotBeRender() {
+ $this->assertNotXPath('//iframe');
+ }
+}
+
+
+
+
class TemplatesDigitalResourcesAudioRecordTest extends AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
@@ -456,62 +515,3 @@ class TemplatesDigitalResourcesAudioRecordTest extends AbstractControllerTestCas
$this->assertXPathContentContains('//div[@class="list-group-item bg-transparent px-0 mb-3"]//a[@class="audio_track card-title text-secondary"][contains(@data-track-url,"bib-numerique/play-ressource/id/4.mp3")]/span[@class="track_title"]', 'The prophecy');
}
}
-
-
-
-
-class TemplatesDigitalResourcesTrailerEmptyPlayerAdministrationTest extends AbstractControllerTestCase {
-
-
- protected $_storm_default_to_volatile = true;
-
-
- public function setUp() {
- parent::setUp();
-
- $this->_buildTemplateProfil(['id' => 5,
- 'template' => 'CHILI']);
-
- $this->fixture('Class_Notice',
- ['id' => 34,
- 'titre_principal' => 'Psycho',
- 'type_doc' => Class_TypeDoc::DISQUE,
- ])
- ->setAuteurPrincipal('M.');
-
- $this->fixture('Class_CodifAuteur',
- ['id' => 324,
- 'libelle' => 'M']);
-
- Class_CosmoVar::set('url_services', 'https://cache-server.org');
-
- $mock_web = $this->mock()
-
- ->whenCalled('open_url')
- ->answers(json_encode(['source' => '',
- 'disable_trailer' => 1,
- 'player' => '']));
-
- Class_WebService_AllServices::setHttpClient($mock_web);
-
- $this->dispatch('/noticeajax/media/id/34');
- }
-
-
- /** @test */
- public function linkToEditTrailerShouldNotBePresent() {
- $this->assertNotXPath('//button[@data-url = "/admin/records/trailer/id/34"]');
- }
-
-
- /** @test */
- public function linkToEnableTrailerShouldBePresent() {
- $this->assertXPath('//button[@data-url = "/admin/records/enable-trailer/id/34"]');
- }
-
-
- /** @test */
- public function trailerShouldNotBeRender() {
- $this->assertNotXPath('//iframe');
- }
-}
\ No newline at end of file