espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-04-13 19:20:52 +03:00
parent 46d8ec757f
commit 0cdbe89f5c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Select/Text/FullTextSearchDataComposer.php
+7 -7
View File
@@ -97,11 +97,7 @@ class FullTextSearchDataComposer
return null;
}
$preparedFilter = $this->prepareFilter($filter);
if ($params->isAuxiliaryUse()) {
$preparedFilter = str_replace('%', '', $preparedFilter);
}
$preparedFilter = $this->prepareFilter($filter, $params);
$function = 'MATCH_BOOLEAN';
@@ -135,7 +131,7 @@ class FullTextSearchDataComposer
);
}
private function prepareFilter(string $filter): string
private function prepareFilter(string $filter, FullTextSearchDataComposerParams $params): string
{
$filter = str_replace(['(', ')'], '', $filter);
@@ -148,12 +144,16 @@ class FullTextSearchDataComposer
);
}
while (mb_substr($filter, -2) === ' *') {
while (mb_substr($filter, -2) === ' *') {
$filter = trim(
mb_substr($filter, 0, mb_strlen($filter) - 2)
);
}
if ($params->isAuxiliaryUse()) {
$filter = str_replace('%', '', $filter);
}
return $filter;
}