Skip to content

adjust regex in duplicate check #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProxiBlue wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

adjust regex in duplicate check #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/code/community/EcomDev/UrlRewrite/Model/Mysql4/Indexer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,7 +1571,7 @@ protected function _importFromCategoryRequestPath()
'IF(rewrite.duplicate_index IS NOT NULL '
. ' AND SUBSTRING_INDEX(rewrite.duplicate_key, ?, -1) = SUBSTRING_INDEX(request_path.request_path, ?, -1), '
. ' rewrite.duplicate_index, '
. ' IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL))',
. ' IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL))',
'/'
)),
'updated' => new Zend_Db_Expr('1'),
Expand All @@ -1593,7 +1593,7 @@ protected function _importFromCategoryRequestPath()
unset($columns['request_path.updated']);

$columns['duplicate_index'] = new Zend_Db_Expr(
'IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL)'
'IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL)'
);

$columns = array(
Expand Down Expand Up @@ -1682,7 +1682,7 @@ protected function _importFromProductRequestPath()
'IF(rewrite.duplicate_index IS NOT NULL '
. ' AND SUBSTRING_INDEX(rewrite.duplicate_key, ?, -1) = SUBSTRING_INDEX(request_path.request_path, ?, -1), '
. ' rewrite.duplicate_index, '
. ' IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL))',
. ' IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL))',
'/'
)),
'target_path' => $targetPathExpr,
Expand All @@ -1706,7 +1706,7 @@ protected function _importFromProductRequestPath()
unset($columns['request_path.updated']);

$columns['duplicate_index'] = new Zend_Db_Expr(
'IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL)'
'IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL)'
);

$columns = array(
Expand Down