hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup setup

Browse Source
This commit is contained in:
Romain Neutron
2012-10-02 13:11:20 +02:00
parent b0ffcc4f54
commit b58cb555c6
3 changed files with 8 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
lib/classes/appbox.class.php
View File

@@ -49,6 +49,8 @@ class appbox extends base
protected $connection;
protected $app;
protected $databoxes;
const CACHE_LIST_BASES = 'list_bases';
const CACHE_SBAS_IDS = 'sbas_ids';
@@ -435,109 +437,6 @@ class appbox extends base
return $this;
}
/**
*
* @param registryInterface $registry
* @param type $conn
* @param type $dbname
* @param type $write_file
* @return type
*/
public static function create(Application $app, connection_interface $conn, $dbname, Version $version, $write_file = false)
{
$credentials = $conn->get_credentials();
if ($conn->is_multi_db() && trim($dbname) === '') {
throw new \Exception(_('Nom de base de donnee incorrect'));
}
if ($write_file) {
if ($conn->is_multi_db() && !isset($credentials['dbname'])) {
$credentials['dbname'] = $dbname;
}
foreach ($credentials as $key => $value) {
$key = $key == 'hostname' ? 'host' : $key;
$connexionINI[$key] = (string) $value;
}
$app['phraseanet.configuration']->initialize();
$connexionINI['driver'] = 'pdo_mysql';
$connexionINI['charset'] = 'UTF8';
$serverName = $app['phraseanet.registry']->get('GV_ServerName');
$root = __DIR__ . '/../../';
$connexion = array(
'main_connexion' => $connexionINI,
'test_connexion' => array(
'driver' => 'pdo_sqlite',
'path' => ':memory:',
'charset' => 'UTF8'
));
$cacheService = "array_cache";
$app['phraseanet.configuration']->setConnexions($connexion);
$services = $app['phraseanet.configuration']->getConfigurations();
foreach ($services as $serviceName => $service) {
if ($serviceName === "doctrine_prod") {
$services["doctrine_prod"]["options"]["cache"] = array(
"query" => $cacheService,
"result" => $cacheService,
"metadata" => $cacheService
);
}
}
$app['phraseanet.configuration']->setConfigurations($services);
$arrayConf = $app['phraseanet.configuration']->getConfigurations();
foreach ($arrayConf as $key => $value) {
if (is_array($value) && array_key_exists('phraseanet', $value)) {
$arrayConf[$key]["phraseanet"]["servername"] = $serverName;
}
if (is_array($value) && $key === 'prod') {
$arrayConf[$key]["cache"] = $cacheService;
}
}
$app['phraseanet.configuration']->setConfigurations($arrayConf);
$app['phraseanet.configuration']->setEnvironnement('prod');
}
try {
if ($conn->is_multi_db()) {
$conn->query('CREATE DATABASE `' . $dbname . '`
CHARACTER SET utf8 COLLATE utf8_unicode_ci');
}
} catch (Exception $e) {
}
try {
if ($conn->is_multi_db()) {
$conn->query('USE `' . $dbname . '`');
}
} catch (Exception $e) {
throw new Exception(_('setup::la base de donnees existe deja et vous n\'avez pas les droits ou vous n\'avez pas les droits de la creer') . $e->getMessage());
}
try {
$appbox = new self($app);
$appbox->insert_datas($version);
} catch (Exception $e) {
throw new Exception('Error while installing ' . $e->getMessage());
}
return $appbox;
}
protected $databoxes;
/**
*
* @return Array
@@ -598,19 +497,6 @@ class appbox extends base
return $databoxes[$sbas_id];
}
public static function list_databox_templates()
{
$files = array();
$dir = new DirectoryIterator(__DIR__ . '/../conf.d/data_templates/');
foreach ($dir as $fileinfo) {
if ($fileinfo->isFile()) {
$files[] = substr($fileinfo->getFilename(), 0, (strlen($fileinfo->getFilename()) - 4));
}
}
return $files;
}
/**
*
* @param <type> $option

12
lib/classes/base.class.php
View File

@@ -207,11 +207,6 @@ abstract class base implements cache_cacheableInterface
throw new Exception(__METHOD__ . ' must be defined in extended class');
}
public function need_major_upgrade()
{
return (version_compare($this->get_version(), '3.2.0.0a1', '<') === true);
}
public function get_version()
{
if ($this->version) {
@@ -240,6 +235,9 @@ abstract class base implements cache_cacheableInterface
return $this->version;
}
/**
* TODO NEUTRON : drop
*/
public function upgradeavailable()
{
if ($this->get_version()) {
@@ -391,7 +389,7 @@ abstract class base implements cache_cacheableInterface
*
* @return base
*/
protected function insert_datas(Version $version)
public function insert_datas()
{
$this->load_schema();
@@ -399,7 +397,7 @@ abstract class base implements cache_cacheableInterface
$this->createTable($table);
}
$this->setVersion($version);
$this->setVersion($this->app['phraseanet.version']);
return $this;
}

2
lib/classes/databox.class.php
View File

@@ -449,7 +449,7 @@ class databox extends base
$app['phraseanet.appbox']->delete_data_from_cache(appbox::CACHE_LIST_BASES);
$databox = $app['phraseanet.appbox']->get_databox($sbas_id);
$databox->insert_datas($app['phraseanet.version']);
$databox->insert_datas();
$databox->setNewStructure(
$data_template, $registry->get('GV_base_datapath_noweb')
);