Merge branch 'sandbox#15516-restful-bokeh'

Conflicts:
	library/startup.php

application/modules/rest/controllers/IndexController.php

+<?php
+/**
+ * Copyright (c) 2012-2014, 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 Rest_IndexController extends Restful_Controller {
+	public function catalogAction() {
+		parent::catalogAction();
+		$this->_helper->getHelper('ViewRenderer')->setNoRender();
+		$this->_response->setBody($this->view->catalog());
+	}
+}
+?>
\ No newline at end of file

library/startup.php

@@ -43,6 +43,7 @@ function setupOpac() {
 
 	$front_controller = setupFrontController($cfg);
 	setupPagination();
+	setupRestful();
 	return $front_controller;
 }
 
@@ -132,9 +133,9 @@ function loadConfig($config_init_file_path = './config.ini') {
 
 function setupCache($cfg) {
 	$frontendOptions = [
-		'lifetime' => 3600, // durée du cache: 1h
-		'automatic_serialization' => false,
-		'caching' => true];
+											'lifetime' => 3600, // durée du cache: 1h
+											'automatic_serialization' => false,
+											'caching' => true];
 
 	$use_memcached = (MEMCACHED_ENABLE === true);
 	$backendOptions = $use_memcached
@@ -230,7 +231,7 @@ function setupHTTPClient($cfg) {
 												 'proxy_port' => $cfg->proxy->port,
 												 'proxy_user' => $cfg->proxy->user,
 												 'proxy_pass' => $cfg->proxy->pass
-												 );
+		);
 		Zend_Registry::set('http_proxy',$proxyConfig);
 
 		$proxy_adapter = new Zend_Http_Client_Adapter_Proxy();
@@ -293,15 +294,15 @@ function setupFrontController($cfg) {
 	return $front_controller
 		->registerPlugin(new ZFDebug_Controller_Plugin_Debug(['plugins' =>
 																													[
-																														'Variables',
-																														'Constants',
-																														'Html',
-																														'Database',
-																														'Memory',
-																														'Time',
-																														'Exception']
-																													 ]
-											 ));
+																													 'Variables',
+																													 'Constants',
+																													 'Html',
+																													 'Database',
+																													 'Memory',
+																													 'Time',
+																													 'Exception']
+																													]
+																												 ));
 }
 
 
@@ -319,22 +320,19 @@ function setupRoutes($front_controller, $cfg) {
 		->addRoute('embed',
 							 new Zend_Controller_Router_Route(
 																								'embed/:controller/:action/*',
-																								array('module' => 'telephone',
-																											'controller' => 'index',
-																											'action' => 'index')))
+																								['module' => 'telephone',
+																								 'controller' => 'index',
+																								 'action' => 'index']))
 		->addRoute('flash',
-							 new Zend_Controller_Router_Route(
-																								'flash/:action/*',
-																								array('module' => 'opacpriv',
-																											'controller' => 'flash',
-																											'action' => 'index')))
+							 new Zend_Controller_Router_Route('flash/:action/*',
+																								['module' => 'opacpriv',
+																								 'controller' => 'flash',
+																								 'action' => 'index']))
 		->addRoute('sitemap',
-							 new Zend_Controller_Router_Route_Static(
-																											'sitemap.xml',
-																											array('module' => 'opac',
-																														'controller' => 'index',
-																														'action' => 'sitemap')));
-
+							 new Zend_Controller_Router_Route_Static('sitemap.xml',
+																											 ['module' => 'opac',
+																												'controller' => 'index',
+																												'action' => 'sitemap']));
 	return $front_controller;
 }
 
@@ -343,3 +341,18 @@ function setupPagination() {
 	Zend_Paginator::setDefaultScrollingStyle('Sliding');
 	Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
 }
+
+
+function setupRestful() {
+	if (!(new Class_Testing_FileSystem())->file_exists(ROOT_PATH . 'restful.php'))
+		return;
+
+	set_include_path(ROOT_PATH . '/restful/library' . PATH_SEPARATOR .
+									 get_include_path());
+
+	$config = new Zend_Config(include ROOT_PATH . 'restful.php');
+	Restful_Model_Configuration::setConfig($config);
+	Restful_Bootstrap::asPlugin(Zend_Controller_Front::getInstance(),
+															'rest',
+															Zend_Controller_Action_HelperBroker::getExistingHelper('ViewRenderer'));
+}
\ No newline at end of file