diff --git a/library/Class/CodifAuteur.php b/library/Class/CodifAuteur.php
index 61a804dc17de3014eacc033fe8f8fbc3265fa6ad..759737f2bb8b51045cb95e27a782ff6f6cd937f8 100644
--- a/library/Class/CodifAuteur.php
+++ b/library/Class/CodifAuteur.php
@@ -21,6 +21,15 @@
class CodifAuteurLoader extends Storm_Model_Loader {
+ public function findByLastNameFirstName($lastname, $firstname) {
+ $code_alpha = str_replace(' ',
+ 'x',
+ Class_Indexation::getInstance()
+ ->alphaMaj($lastname . '|' . $firstname));
+ return Class_CodifAuteur::findByCodeAlpha($code_alpha);
+ }
+
+
public function findOrCreate($code_alpha, $auteur) {
$existing = Class_CodifAuteur::findByCodeAlpha($code_alpha);
diff --git a/library/Class/Notice.php b/library/Class/Notice.php
index bd76d4bc4351c23e774891f0b44ea747eaf2ecee..9a6fafc6f749c16693c7476da56af55cda6e9038 100644
--- a/library/Class/Notice.php
+++ b/library/Class/Notice.php
@@ -1204,12 +1204,8 @@ class Class_Notice extends Storm_Model_Abstract {
$prenom = $item[1];
$fonction = $item[2];
$fonction_pergame = $item[3];
- $code_alpha = $indexation->alphaMaj($nom . '|' . $prenom);
- $code_alpha = str_replace(' ', 'x', $code_alpha);
- if (!$code_alpha)
- return [];
- if (!$codif_auteur = Class_CodifAuteur::findByCodeAlpha($code_alpha))
+ if (!$codif_auteur = Class_CodifAuteur::findByLastNameFirstName($nom, $prenom))
return [];
if ($fonction_pergame)
diff --git a/library/Class/Onglet/Analytics.php b/library/Class/Onglet/Analytics.php
index 4bd9324ae7f9d7bcb61b4c4d3ab00819982bf7e5..5955a84f188e53ab1617fab0a41aaf997b71475f 100644
--- a/library/Class/Onglet/Analytics.php
+++ b/library/Class/Onglet/Analytics.php
@@ -70,34 +70,4 @@ class Class_Onglet_Analytics extends Class_Onglet {
}
}
-
-
-class Class_Onglet_AnalyticsItem {
- protected $_title, $_authors=[];
-
- public function setTitle($title) {
- $this->_title = $title;
- }
-
-
- public function addAuthor($author) {
- $this->_authors[] = $author;
- }
-
-
- public function isValid() {
- return '' != $this->_title;
- }
-
-
- public function html() {
- if (!$this->isValid())
- return '';
-
- return $this->_title
- . ((!empty($this->_authors))
- ? ' / ' . implode(' / ', $this->_authors)
- : '');
- }
-}
?>
\ No newline at end of file
diff --git a/library/Class/Onglet/AnalyticsItem.php b/library/Class/Onglet/AnalyticsItem.php
new file mode 100644
index 0000000000000000000000000000000000000000..35311a9052b2b828f06af4e5ad773bd385554560
--- /dev/null
+++ b/library/Class/Onglet/AnalyticsItem.php
@@ -0,0 +1,65 @@
+<?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
+ */
+
+
+class Class_Onglet_AnalyticsItem {
+ protected
+ $_title = '',
+ $_authors=[];
+
+ public function setTitle($title) {
+ $this->_title = $title;
+ }
+
+
+ public function isValid() {
+ return '' != $this->_title;
+ }
+
+
+ public function addAuthor($author) {
+ $this->_authors[] = $author;
+ }
+
+
+ public function acceptVisitor($visitor) {
+ if (!$this->isValid())
+ return $this;
+
+ $visitor->visitTitle($this->_title);
+
+ foreach($this->_authors as $author)
+ $this->acceptAuthorVisitor($author, $visitor);
+ }
+
+
+ public function acceptAuthorVisitor($author, $visitor) {
+ if (!preg_match('/([\w\s&]+)(\s*,\s*([\w-]+))?/u', $author, $matches))
+ return $visitor->visitAuthor($author);
+
+ $visitor->visitAuthorLastNameFirstName($author,
+ $matches[1],
+ isset($matches[3]) ? $matches[3] : '');
+ }
+}
+
+
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Notice/Analytics.php b/library/ZendAfi/View/Helper/Notice/Analytics.php
index c54dd282642ec94559427b91a8369a1e4f4a1e7b..06a1683c2a85ea4b6313081412c7f4f886b26323 100644
--- a/library/ZendAfi/View/Helper/Notice/Analytics.php
+++ b/library/ZendAfi/View/Helper/Notice/Analytics.php
@@ -23,17 +23,59 @@
class ZendAfi_View_Helper_Notice_Analytics extends Zend_View_Helper_HtmlElement {
use Trait_Translator;
+
+ protected $_item_html;
+
public function notice_analytics($notice) {
$items = Class_Onglet_Analytics::getRecounts($notice);
if (empty($items))
return '';
$html = '<ul><li>';
- $items_html = array_map(function ($item) {return $item->html();},
+ $items_html = array_map([$this, 'renderItem'],
$items);
$html .= implode('</li><li>', $items_html);
$html .= '</li></ul>';
return $html;
}
+
+
+ public function renderItem($item) {
+ $this->_item_html = '';
+
+ $item->acceptVisitor($this);
+
+ return $this->_item_html;
+ }
+
+
+ public function visitTitle($title) {
+ $this->_item_html = $title;
+ }
+
+
+ public function visitAuthor($author) {
+ $this->_item_html .= ' / ' . $author;
+ }
+
+
+ public function visitAuthorLastNameFirstName($author, $lastname, $firstname) {
+ if (!$codif_auteur = Class_CodifAuteur::findByLastNameFirstName($lastname, $firstname))
+ return $this->visitAuthor($author);
+
+ $rebound = (new Class_Notice_Field())
+ ->setId(Class_CodifAuteur::CODE_FACETTE)
+ ->setLabel($author)
+ ->setUrlParams(['controller' => 'recherche',
+ 'action' => 'simple',
+ 'code_rebond' => Class_CodifAuteur::CODE_FACETTE.$codif_auteur->getId(),
+ 'id_notice' => null,
+ 'facettes' => null,
+ 'facette' => null,
+ 'serie' => null,
+ 'page' => null]);
+
+ $this->_item_html .= ' / ' . $rebound->renderOn($this->view);
+ }
}
?>
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
index 305fbb47f736480f9a3f488ec339cc6f516c2788..12d40d06c4ec7c4279ed436891cf21e897d4fc17 100644
--- a/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
+++ b/tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
@@ -2152,9 +2152,24 @@ class NoticeAjaxControllerRecountsTest extends AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
public function setUp() {
parent::setUp();
+
+ $dupontel = $this->fixture('Class_CodifAuteur',
+ ['id' => 25,
+ 'code_alpha' => 'DUPONTELxJEANxFRANCOIS',
+ 'libelle' => 'Dupontel, Jean-François',
+ 'formes' => 'DUPONTELxJEANxFRANCOIS']);
+
+ Storm_Test_ObjectWrapper::onLoaderOfModel('Class_CodifAuteur')
+ ->whenCalled('findByCodeAlpha')
+ ->answers(null)
+
+ ->whenCalled('findByCodeAlpha')
+ ->with('DUPONTELxJEANxFRANCOIS')
+ ->answers($dupontel);
+
$record = $this->fixture('Class_Notice',['id'=> 10,
- 'titre_principal' => 'Le photographe',
- 'auteur_principal' => 'Guibert',
+ 'titre_principal' => 'Un héros trés discret',
+ 'auteur_principal' => 'Jacques Audiard',
'unimarc' =>file_get_contents(realpath(dirname(__FILE__)).'../../../../../fixtures/audiard_herosdiscret.uni')]);
@@ -2163,23 +2178,24 @@ class NoticeAjaxControllerRecountsTest extends AbstractControllerTestCase {
Class_Profil::getCurrentProfil()
->setCfgModules(['recherche' =>
['viewnotice0' => [
- 'analytics' => '702',
- 'analytics_title' => '6',
+ 'analytics' => '464',
+ 'analytics_title' => 't',
'analytics_authors' => 'a'
]]]);
- $this->dispatch('/noticeajax/recounts/id_notice/10');
+ $this->dispatch('/noticeajax/recounts/id_notice/10', true);
}
/** @test */
public function dupontelShouldBePresent() {
- $this->assertXpathContentContains('//ul/li','Acteur / Dupontel',$this->_response->getBody());
+ $this->assertXpathContentContains('//ul/li[contains(text(), "acte 1 / ")]/a[contains(@href, "recherche/simple/code_rebond/A25")]',
+ utf8_encode('Dupontel, Jean-François (2013)'));
}
/** @test */
public function leHenryShouldBePresent() {
- $this->assertXpathContentContains('//ul/li','Intervenant / Le Henry',$this->_response->getBody());
+ $this->assertXpathContentContains('//ul/li','acte 2 / Le Henry, Alain', $this->_response->getBody());
}
}
\ No newline at end of file
diff --git a/tests/fixtures/audiard_herosdiscret.uni b/tests/fixtures/audiard_herosdiscret.uni
index 602bdcce7151f8d2b11b93c83f4bdcd181f26234..7ec63f190351a51a4760061f1b3ad940ed57ae13 100644
--- a/tests/fixtures/audiard_herosdiscret.uni
+++ b/tests/fixtures/audiard_herosdiscret.uni
@@ -1 +1 @@
-01518ngm0 2200349 450 001000700000071002700007073001800034100001300052200004500065210001900110215001600129300013500145345001800280606002200298686001300320686004100333686003500374700007300409702005300482702005200535702004800587702004500635702004900680702005300729702003400782702003300816702003800849801001700887932001000904992012500914995012901039 694479 a826030-9 bStudio Canal a5050582603095 a20141106 1 aUn héros très discret fJacques Audiard cAliceleo d1996 a1 DVD, 1h41 aD'après le roman de Jean-François Deniau. - Bonus : interview du réalisateur et Alain Le Henry. Scènes commentées. Making of. b826030-9 cDVD acinéma français aF 2PCDM4 aFiction tFiction 2Code_Statistique_1 aFilm tFilm 2Code_Statistique_2 1 aAudiard bJacques 31000251106 g300 6Metteur en scène ou réalisateur 1 aDesplat bAlexandre 31000250811 4230 6Compositeur 1 aDeniau bJean-François 31000134967 4070 6Auteur 1 aKassovitz bMathieu 31000219869 4005 6Acteur 1 aGrinberg bAnouk 31303500060 4005 6Acteur 1 aKiberlain bSandrine 31000362704 4005 gActeur 1 aTrintignant bJean-Louis 31000229823 4005 6Acteur 1 aDupontel bAlbert 4005 6Acteur 1 aBarentin bNadia 4005 6Acteur 1 aLe Henry bAlain 4000 6Intervenant 2 aFr c20150829 aDrame uhttp://ecx.images-amazon.com/images/I/51%2BE27GCzjL._SL160_.jpg vhttp://ecx.images-amazon.com/images/I/51%2BE27GCzjL.jpg aMédiathèque f31879003220456 kF AUD m20150829 qd rgf op v1 2[DISPO][Disponible][0][1][][0][0][0][0] 42015-02-13 67 77 81 97
\ No newline at end of file
+01682ngm0 2200373 450 001000700000071002700007073001800034100001300052200004500065210001900110215001600129300013500145345001800280464004400298464002800342606002200370686001500392686004300407686003700450700007700487702005900564702005800623702005400681702005100735702005300786702005900839702003800898702003700936702004200973801001701015932001001032992012501042995014101167 694479 a826030-9 bStudio Canal a5050582603095 a20141106 1 aUn héros très discret fJacques Audiard cAliceleo d1996 a1 DVD, 1h41 aD'après le roman de Jean-François Deniau. - Bonus : interview du réalisateur et Alain Le Henry. Scènes commentées. Making of. b826030-9 cDVD aDupontel, Jean-François (2013) tacte 1 aLe Henry, Alain tacte 2 acinéma français aF $2 PCDM4 aFiction tFiction $2 Code_Statistique_1 aFilm tFilm $2 Code_Statistique_2 1 aAudiard bJacques $3 1000251106 g300 $6 Metteur en scène ou réalisateur 1 aDesplat bAlexandre $3 1000250811 $4 230 $6 Compositeur 1 aDeniau bJean-François $3 1000134967 $4 070 $6 Auteur 1 aKassovitz bMathieu $3 1000219869 $4 005 $6 Acteur 1 aGrinberg bAnouk $3 1303500060 $4 005 $6 Acteur 1 aKiberlain bSandrine $3 1000362704 $4 005 gActeur 1 aTrintignant bJean-Louis $3 1000229823 $4 005 $6 Acteur 1 aDupontel bAlbert $4 005 $6 Acteur 1 aBarentin bNadia $4 005 $6 Acteur 1 aLe Henry bAlain $4 000 $6 Intervenant 2 aFr c20150829 aDrame uhttp://ecx.images-amazon.com/images/I/51%2BE27GCzjL._SL160_.jpg vhttp://ecx.images-amazon.com/images/I/51%2BE27GCzjL.jpg aMédiathèque f31879003220456 kF AUD m20150829 qd rgf op v1 $2 [DISPO][Disponible][0][1][][0][0][0][0] $4 2015-02-13 $6 7 $7 7 $8 1 $9 7
\ No newline at end of file
diff --git a/tests/library/Class/Onglet/AnalyticsItemTest.php b/tests/library/Class/Onglet/AnalyticsItemTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f95bb5aeba5dd8d4437a1f7d72a232ee32a11ba4
--- /dev/null
+++ b/tests/library/Class/Onglet/AnalyticsItemTest.php
@@ -0,0 +1,62 @@
+<?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
+ */
+
+
+class Class_Onglet_AnalyticsItemTest extends ModelTestCase {
+ protected
+ $_lastname,
+ $_firstname;
+
+ public function authors() {
+ return [
+ [ 'Truffaut, François' , 'Truffaut', 'François' ],
+ [ 'Godard, Jean-Luc' , 'Godard', 'Jean-Luc' ],
+ [ 'Abba' , 'Abba', '' ],
+ [ 'Kool & Gang' , 'Kool & Gang', '' ],
+ [ 'Village People' , 'Village People', '' ]
+ ];
+ }
+
+ /**
+ * @test
+ * @dataProvider authors
+ */
+ public function authorLabelShouldDecomposeIntoLastNameFirstName($author, $lastname, $firstname) {
+ $item = new Class_Onglet_AnalyticsItem();
+ $item->setTitle('test');
+ $item->addAuthor($author);
+ $item->acceptVisitor($this);
+
+ $this->assertEquals([$lastname, $firstname], [$this->_lastname, $this->_firstname]);
+ }
+
+
+ public function visitAuthor($author) {}
+
+ public function visitAuthorLastNameFirstName($author, $lastname, $firstname) {
+ $this->_lastname = $lastname;
+ $this->_firstname = $firstname;
+ }
+
+ public function visitTitle($title) {}
+
+}
+?>
\ No newline at end of file