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

rewriting

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-03 16:51:41 +02:00
parent 2bc1dc0bec
commit 43ff0b7297
15 changed files with 406 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/lib/Thelia/Rewriting/RewritingResolver.php
View File

@@ -23,9 +23,11 @@
namespace Thelia\Rewriting;
use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\Join;
use Thelia\Exception\RewritingUrlException;
use Thelia\Exception\UrlRewritingException;
use Thelia\Model\RewritingArgumentQuery;
use Thelia\Model\RewritingUrlQuery;
use Thelia\Model\Map\RewritingUrlTableMap;
/**
* Class RewritingResolver
@@ -36,13 +38,19 @@ use Thelia\Model\RewritingArgumentQuery;
*/
class RewritingResolver
{
protected $search = null;
protected $rewritingUrlQuery = null;
public $view;
public $viewId;
public $locale;
public $otherParameters;
public $redirectedToUrl;
public function __construct($url = null)
{
$this->rewritingUrlQuery = new RewritingUrlQuery();
if($url !== null) {
$this->load($url);
}
@@ -50,22 +58,28 @@ class RewritingResolver
public function load($rewrittenUrl)
{
$search = RewritingArgumentQuery::create()
//->filterByUrl($rewrittenUrl)
->joinRewritingUrl('ru', Criteria::RIGHT_JOIN)
->where('`ru`.URL = ?', $rewrittenUrl, \PDO::PARAM_STR)
->withColumn('`ru`.URL', 'ru_url')
->withColumn('`ru`.VIEW', 'ru_view')
->withColumn('`ru`.VIEW_LOCALE', 'ru_locale')
->withColumn('`ru`.VIEW_ID', 'ru_viewId')
->find();
$this->search = $this->rewritingUrlQuery->getResolverSearch($rewrittenUrl);
if($search->count() == 0) {
if($this->search->count() == 0) {
throw new UrlRewritingException('URL NOT FOUND', UrlRewritingException::URL_NOT_FOUND);
}
$this->view = $this->search->getFirst()->getVirtualColumn('ru_view');
$this->viewId = $this->search->getFirst()->getVirtualColumn('ru_viewId');
$this->locale = $this->search->getFirst()->getVirtualColumn('ru_locale');
$this->redirectedToUrl = $this->search->getFirst()->getVirtualColumn('ru_redirected_to_url');
$this->otherParameters = $this->getOtherParameters();
}
protected function getOtherParameters()
{
if($this->search === null) {
throw new UrlRewritingException('RESOLVER NULL SEARCH', UrlRewritingException::RESOLVER_NULL_SEARCH);
}
$otherParameters = array();
foreach($search as $result) {
foreach($this->search as $result) {
$parameter = $result->getParameter();
$value = $result->getValue();
@@ -74,9 +88,8 @@ class RewritingResolver
}
}
$this->view = $search->getFirst()->getVirtualColumn('ru_view');
$this->viewId = $search->getFirst()->getVirtualColumn('ru_viewId');
$this->locale = $search->getFirst()->getVirtualColumn('ru_locale');
$this->otherParameters = $otherParameters;
return $otherParameters;
}
}

106
core/lib/Thelia/Rewriting/RewritingRetriever.php
View File

@@ -23,8 +23,9 @@
namespace Thelia\Rewriting;
use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Model\Base\RewritingUrlQuery;
use Thelia\Model\RewritingUrlQuery;
use Thelia\Model\Map\RewritingUrlTableMap;
use Thelia\Tools\URL;
/**
* Class RewritingRetriever
@@ -35,38 +36,40 @@ use Thelia\Model\Map\RewritingUrlTableMap;
*/
class RewritingRetriever
{
/**
* @param $view
* @param $viewLocale
* @param $viewId
*
* @return null|$url
*/
public function getViewUrl($view, $viewLocale, $viewId)
{
$url = $this->getViewUrlQuery($view, $viewId, $viewLocale);
protected $search = null;
protected $rewritingUrlQuery = null;
return $url === null ? null : $url->getUrl();
public $url;
public $rewrittenUrl;
public function __construct($view = null, $viewLocale = null, $viewId = null)
{
$this->rewritingUrlQuery = new RewritingUrlQuery();
if($view !== null && $viewLocale !== null) {
$this->load($view, $viewLocale, $viewId);
}
}
/**
* @param $view
* @param $viewId
* @param $viewLocale
*
* @return null|RewritingUrl
* @param $view
* @param $viewLocale
* @param null $viewId
*/
protected function getViewUrlQuery($view, $viewId, $viewLocale)
public function loadViewUrl($view, $viewLocale, $viewId = null)
{
return RewritingUrlQuery::create()
->joinRewritingArgument('ra', Criteria::LEFT_JOIN)
->where('ISNULL(`ra`.REWRITING_URL_ID)')
->filterByView($view)
->filterByViewLocale($viewLocale)
->filterByViewId($viewId)
->filterByRedirected(null)
->orderByUpdatedAt(Criteria::DESC)
->findOne();
$this->search = $this->rewritingUrlQuery->getViewUrlQuery($view, $viewLocale, $viewId);
$allParametersWithoutView = array();
$allParametersWithoutView['locale'] = $viewLocale;
if(null !== $viewId) {
$allParametersWithoutView[$view . '_id'] = $viewId;
}
$this->url = URL::viewUrl($view, $allParametersWithoutView);
if($this->search !== null) {
$this->rewrittenUrl = $this->search->getUrl();
}
}
/**
@@ -74,50 +77,25 @@ class RewritingRetriever
* @param $viewLocale
* @param null $viewId
* @param array $viewOtherParameters
*
* @return null|$url
*/
public function getSpecificUrl($view, $viewLocale, $viewId = null, $viewOtherParameters = array())
public function loadSpecificUrl($view, $viewLocale, $viewId = null, $viewOtherParameters = array())
{
if(empty($viewOtherParameters)) {
return $this->getViewUrl($view, $viewLocale, $viewId);
$this->loadViewUrl($view, $viewLocale, $viewId);
return;
}
$urlQuery = RewritingUrlQuery::create()
->joinRewritingArgument('ra', Criteria::LEFT_JOIN)
->withColumn('`ra`.REWRITING_URL_ID', 'ra_REWRITING_URL_ID')
->filterByView($view)
->filterByViewLocale($viewLocale)
->filterByViewId($viewId)
->filterByRedirected(null)
->orderByUpdatedAt(Criteria::DESC);
$this->search = $this->rewritingUrlQuery->getSpecificUrlQuery($view, $viewLocale, $viewId, $viewOtherParameters);
$otherParametersCount = count($viewOtherParameters);
if($otherParametersCount > 0) {
$parameterConditions = array();
foreach($viewOtherParameters as $parameter => $value) {
$conditionName = 'other_parameter_condition_' . count($parameterConditions);
$urlQuery->condition('parameter_condition', '`ra`.PARAMETER= ?', $parameter, \PDO::PARAM_STR)
->condition('value_condition', '`ra`.VALUE = ?', $value, \PDO::PARAM_STR)
->combine(array('parameter_condition', 'value_condition'), Criteria::LOGICAL_AND, $conditionName);
$parameterConditions[] = $conditionName;
}
$urlQuery->where($parameterConditions, Criteria::LOGICAL_OR);
$urlQuery->groupBy(RewritingUrlTableMap::ID);
$urlQuery->condition('count_condition_1', 'COUNT(' . RewritingUrlTableMap::ID . ') = ?', $otherParametersCount, \PDO::PARAM_INT) // ensure we got all the asked parameters (provided by the query)
->condition('count_condition_2', 'COUNT(' . RewritingUrlTableMap::ID . ') = (SELECT COUNT(*) FROM rewriting_argument WHERE rewriting_argument.REWRITING_URL_ID = ra_REWRITING_URL_ID)'); // ensure we don't miss any parameters (needed to match the rewritten url)
$urlQuery->having(array('count_condition_1', 'count_condition_2'), Criteria::LOGICAL_AND);
} else {
$urlQuery->where('ISNULL(`ra`.REWRITING_URL_ID)');
$allParametersWithoutView = $viewOtherParameters;
$allParametersWithoutView['locale'] = $viewLocale;
if(null !== $viewId) {
$allParametersWithoutView[$view . '_id'] = $viewId;
}
$url = $urlQuery->findOne();
return $url === null ? null : $url->getUrl();
$this->url = URL::viewUrl($view, $allParametersWithoutView);
if($this->search !== null) {
$this->rewrittenUrl = $this->search->getUrl();
}
}
}