diff --git a/.gitattributes b/.gitattributes
index 0b1e952622034e4d87a6b5dce6e890fd02834b94..15e164ad7eeb562bb81357da6ba81192f2150635 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2061,6 +2061,7 @@ library/ZendAfi/View/Helper/Admin/TagListeSuggestion.php -text
library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php -text
library/ZendAfi/View/Helper/Admin/TreeSelect.php -text
library/ZendAfi/View/Helper/AjaxMessage.php -text
+library/ZendAfi/View/Helper/Album/JsonVisitor.php -text
library/ZendAfi/View/Helper/AlbumRessourceInfos.php -text
library/ZendAfi/View/Helper/Avis.php -text
library/ZendAfi/View/Helper/AvisCms.php -text
diff --git a/application/modules/opac/controllers/BibNumeriqueController.php b/application/modules/opac/controllers/BibNumeriqueController.php
index 57145d1069161e97b19a5169c75c2bf093015fd2..8891b41892ffce38990f5e932fbf13cb3a2de390 100644
--- a/application/modules/opac/controllers/BibNumeriqueController.php
+++ b/application/modules/opac/controllers/BibNumeriqueController.php
@@ -29,78 +29,14 @@ class BibNumeriqueController extends Zend_Controller_Action {
}
- public function albumPageParams($album, $left_or_right) {
- return array('width' => (int)$album->getThumbnailWidth(),
- 'crop_top' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_top'),
- 'crop_right' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_right'),
- 'crop_bottom' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_bottom'),
- 'crop_left' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_left'));
- }
-
-
- public function albumPageThumbnailUrl($album, $left_or_right, $width = null) {
- return $this->view->url(array_merge(
- array('controller' => 'bib-numerique',
- 'action' => 'thumbnail'),
- $this->albumPageParams($album, $left_or_right)),
- null,
- true);
- }
-
-
/**
* Génére le JSON pour le livre numérique
*/
public function albumAction() {
$album = Class_Album::getLoader()->find((int)$this->_getParam('id'));
- $thumbnail_params = array($this->albumPageParams($album, 'right'),
- $this->albumPageParams($album, 'left'));
-
- $thumbnail_urls = array($this->albumPageThumbnailUrl($album, 'right'),
- $this->albumPageThumbnailUrl($album, 'left'));
-
-
- $json = new StdClass();
- $json->album = new StdClass();
- $json->album->id = $album->getId();
- $json->album->titre = $album->getTitre();
- $json->album->download_url = '';
- if ($album->hasPdf())
- $json->album->download_url = $this->view->url(array('action' => 'download_album',
- 'id' => $album->getId().'.pdf'));
- $json->album->description = $album->getDescription();
- $json->album->ressources = array();
- $json->album->width = $album->getThumbnailWidth();
- $json->album->height = $album->getThumbnailHeight();
-
- $page = 0;
- foreach($album->getRessources() as $ressource) {
- $right_or_left = ($page++ % 2);
- $json_ressource = new StdClass();
- $json_ressource->id = $ressource->getId();
- $json_ressource->foliono = $ressource->getFolio();
- $json_ressource->titre = $ressource->getTitre();
- $json_ressource->link_to = $ressource->getLinkTo();
- $json_ressource->description = $ressource->getDescription();
-
- $params = $thumbnail_params[$right_or_left];
- $params['id'] = (int)$ressource->getId();
-
- if ($ressource->isThumbnailExistsForParams($params))
- $json_ressource->thumbnail = $ressource->getThumbnailUrlForParams($params);
- else
- $json_ressource->thumbnail = $thumbnail_urls[$right_or_left].'/id/'.$ressource->getId();
-
- $json_ressource->navigator_thumbnail = $ressource->getThumbnailUrl();
- $json_ressource->original = $ressource->getOriginalUrl();
- $json->album->ressources []= $json_ressource;
- }
-
-
$this->getHelper('ViewRenderer')->setNoRender();
- $this->_response->setHeader('Content-Type', 'application/json');
- $this->_response->setBody(json_encode($json));
+ $this->_response->setBody($this->view->album_jsonVisitor($album));
}
diff --git a/library/ZendAfi/View/Helper/Album/JsonVisitor.php b/library/ZendAfi/View/Helper/Album/JsonVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..2defb643fc1e2e9b8a7e09fc89e1f46ae8c97d61
--- /dev/null
+++ b/library/ZendAfi/View/Helper/Album/JsonVisitor.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2012, Agence Française Informatique (AFI). All rights reserved.
+ *
+ * AFI-OPAC 2.0 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).
+ *
+ * AFI-OPAC 2.0 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 AFI-OPAC 2.0; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+class ZendAfi_View_Helper_Album_JsonVisitor extends Zend_View_Helper_Json {
+ public function albumPageParams($album, $left_or_right) {
+ return array('width' => (int)$album->getThumbnailWidth(),
+ 'crop_top' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_top'),
+ 'crop_right' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_right'),
+ 'crop_bottom' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_bottom'),
+ 'crop_left' => (int)$album->_get('thumbnail_'.$left_or_right.'_page_crop_left'));
+ }
+
+
+ public function albumPageThumbnailUrl($album, $left_or_right, $width = null) {
+ return $this->view->url(array_merge(
+ array('controller' => 'bib-numerique',
+ 'action' => 'thumbnail'),
+ $this->albumPageParams($album, $left_or_right)),
+ null,
+ true);
+ }
+
+
+ public function album_jsonVisitor($album) {
+ $thumbnail_params = array($this->albumPageParams($album, 'right'),
+ $this->albumPageParams($album, 'left'));
+
+ $thumbnail_urls = array($this->albumPageThumbnailUrl($album, 'right'),
+ $this->albumPageThumbnailUrl($album, 'left'));
+
+
+ $json = new StdClass();
+ $json->album = new StdClass();
+ $json->album->id = $album->getId();
+ $json->album->titre = $album->getTitre();
+ $json->album->download_url = '';
+ if ($album->hasPdf())
+ $json->album->download_url = $this->view->url(array('action' => 'download_album',
+ 'id' => $album->getId().'.pdf'));
+ $json->album->description = $album->getDescription();
+ $json->album->ressources = array();
+ $json->album->width = $album->getThumbnailWidth();
+ $json->album->height = $album->getThumbnailHeight();
+
+ $page = 0;
+ foreach($album->getRessources() as $ressource) {
+ $right_or_left = ($page++ % 2);
+ $json_ressource = new StdClass();
+ $json_ressource->id = $ressource->getId();
+ $json_ressource->foliono = $ressource->getFolio();
+ $json_ressource->titre = $ressource->getTitre();
+ $json_ressource->link_to = $ressource->getLinkTo();
+ $json_ressource->description = $ressource->getDescription();
+
+ $params = $thumbnail_params[$right_or_left];
+ $params['id'] = (int)$ressource->getId();
+
+ if ($ressource->isThumbnailExistsForParams($params))
+ $json_ressource->thumbnail = $ressource->getThumbnailUrlForParams($params);
+ else
+ $json_ressource->thumbnail = $thumbnail_urls[$right_or_left].'/id/'.$ressource->getId();
+
+ $json_ressource->navigator_thumbnail = $ressource->getThumbnailUrl();
+ $json_ressource->original = $ressource->getOriginalUrl();
+ $json->album->ressources []= $json_ressource;
+ }
+
+ return $this->json($json);
+ }
+}
+
+?>
\ No newline at end of file