TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache dataccessfunctions

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-23 11:24:30 +02:00
parent ac435b8f87
commit d015c8c3b8
1 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
View File

@@ -56,6 +56,8 @@ class DataAccessFunctions extends AbstractSmartyPlugin
protected $request; protected $request;
protected $dispatcher; protected $dispatcher;
private static $dataAccessCache = array();
public function __construct(Request $request, SecurityContext $securityContext, ParserContext $parserContext, ContainerAwareEventDispatcher $dispatcher) public function __construct(Request $request, SecurityContext $securityContext, ParserContext $parserContext, ContainerAwareEventDispatcher $dispatcher)
{ {
$this->securityContext = $securityContext; $this->securityContext = $securityContext;
@@ -160,7 +162,12 @@ class DataAccessFunctions extends AbstractSmartyPlugin
public function countryDataAccess($params, $smarty) public function countryDataAccess($params, $smarty)
{ {
$defaultCountry = CountryQuery::create()->findOneByByDefault(1); if(array_key_exists('defaultCountry', self::$dataAccessCache)) {
$defaultCountry = self::$dataAccessCache['defaultCountry'];
} else {
$defaultCountry = CountryQuery::create()->findOneByByDefault(1);
self::$dataAccessCache['defaultCountry'] = $defaultCountry;
}
switch($params["attr"]) { switch($params["attr"]) {
case "default": case "default":
@@ -170,6 +177,13 @@ class DataAccessFunctions extends AbstractSmartyPlugin
public function cartDataAccess($params, $smarty) public function cartDataAccess($params, $smarty)
{ {
if(array_key_exists('currentCountry', self::$dataAccessCache)) {
$currentCountry = self::$dataAccessCache['currentCountry'];
} else {
$currentCountry = CountryQuery::create()->findOneById(64); // @TODO : make it magic
self::$dataAccessCache['currentCountry'] = $currentCountry;
}
$cart = $this->getCart($this->request); $cart = $this->getCart($this->request);
$result = ""; $result = "";
switch($params["attr"]) { switch($params["attr"]) {
@@ -180,9 +194,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
$result = $cart->getTotalAmount(); $result = $cart->getTotalAmount();
break; break;
case "total_taxed_price": case "total_taxed_price":
$result = $cart->getTaxedAmount( $result = $cart->getTaxedAmount($currentCountry);
CountryQuery::create()->findOneById(64) // @TODO : make it magic
);
break; break;
} }
@@ -234,24 +246,30 @@ class DataAccessFunctions extends AbstractSmartyPlugin
*/ */
protected function dataAccessWithI18n($objectLabel, $params, ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') protected function dataAccessWithI18n($objectLabel, $params, ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID')
{ {
$lang = $this->getNormalizedParam($params, array('lang')); if(array_key_exists('data_' . $objectLabel, self::$dataAccessCache)) {
if ($lang === null) { $data = self::$dataAccessCache['data_' . $objectLabel];
$lang = $this->request->getSession()->getLang()->getId(); } else {
$lang = $this->getNormalizedParam($params, array('lang'));
if ($lang === null) {
$lang = $this->request->getSession()->getLang()->getId();
}
ModelCriteriaTools::getI18n(
false,
$lang,
$search,
$this->request->getSession()->getLang()->getLocale(),
$columns,
$foreignTable,
$foreignKey,
true
);
$data = $search->findOne();
self::$dataAccessCache['data_' . $objectLabel] = $data;
} }
ModelCriteriaTools::getI18n(
false,
$lang,
$search,
$this->request->getSession()->getLang()->getLocale(),
$columns,
$foreignTable,
$foreignKey,
true
);
$data = $search->findOne();
$noGetterData = array(); $noGetterData = array();
foreach ($columns as $column) { foreach ($columns as $column) {
$noGetterData[$column] = $data->getVirtualColumn('i18n_' . $column); $noGetterData[$column] = $data->getVirtualColumn('i18n_' . $column);