coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Search/Misc

Browse source 
* why loop when regex does trick
 * further unify variable naming and layout
This commit is contained in:
Sarjuuk 2026-01-19 20:12:17 +01:00
parent 09fe715bc1
commit 4c598972cc
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
includes/components/filter.class.php
View file

@ -567,14 +567,14 @@ abstract class Filter
return sprintf($exact ? '%s' : '%%%s%%', $string);
}
protected function tokenizeString(array $fields, string $string = '', bool $exact = false, bool $shortStr = false) : array
protected function tokenizeString(array $fields, string $string = '', bool $exact = false, bool $allowShort = false) : array
{
if (!$string && $this->values['na'])
$string = $this->values['na'];
// always allow sub 3 chars for logographic locales
if (Lang::getLocale()->isLogographic())
$shortStr = true;
$allowShort = true;
$qry = [];
foreach ($fields as $f)
@ -583,9 +583,9 @@ abstract class Filter
$tokens = $exact ? [$string] : array_filter(explode(' ', $string));
foreach ($tokens as $t)
{
if ($t[0] == '-' && (mb_strlen($t) > 3 || $shortStr))
if ($t[0] == '-' && (mb_strlen($t) > 3 || $allowShort))
$sub[] = [$f, $this->transformToken(mb_substr($t, 1), $exact), '!'];
else if ($t[0] != '-' && (mb_strlen($t) > 2 || $shortStr))
else if ($t[0] != '-' && (mb_strlen($t) > 2 || $allowShort))
$sub[] = [$f, $this->transformToken($t, $exact)];
}
@ -614,13 +614,13 @@ abstract class Filter
return $qry;
}
protected function buildMatchLookup(array $fields, string $string = '', bool $exact = false, bool $shortStr = false) : array
protected function buildMatchLookup(array $fields, string $string = '', bool $exact = false, bool $allowShort = false) : array
{
if (!$string && $this->values['na'])
$string = $this->values['na'];
if (Lang::getLocale()->isLogographic() && !Cfg::get('LOGOGRAPHIC_FT_SEARCH'))
return $this->tokenizeString($fields, $string, $exact, $shortStr);
return $this->tokenizeString($fields, $string, $exact, $allowShort);
$string = trim(preg_replace(self::PATTERN_FT, ' ', $string));
if (!$string)
@ -628,7 +628,7 @@ abstract class Filter
// always allow sub 3 chars for logographic locales
if (Lang::getLocale()->isLogographic())
$shortStr = true;
$allowShort = true;
$sub = [];
$tokens = $exact ? [$string] : array_filter(explode(' ', $string));
@ -640,16 +640,10 @@ abstract class Filter
// cant have trailing/leading dashes. FT confuses them for additional modifiers and dies with a syntax error
// would be an issue for all modifiers, but Filter::PATTERN_FT only allows for - at this point
while (($t[0] ?? '') === '-')
$t = mb_substr($t, 1);
$t = preg_replace('/^-+|-+$/', '', $t);
while (($t[-1] ?? '') === '-')
$t = mb_substr($t, 0, -1);
if (!$shortStr && mb_strlen($t) < 3)
continue;
$sub[] = ($ex ? '-' : '+') . $t . '*';
if ($allowShort || mb_strlen($t) > 2)
$sub[] = ($ex ? '-' : '+') . $t . '*';
}
$qry = [];

12
includes/components/search.class.php
View file

@ -108,6 +108,8 @@ class Search
return;
}
$allowShort = Lang::getLocale()->isLogographic();
foreach (explode(' ', $this->query) as $raw)
{
// ivalid chars for both LIKE and MATCH
@ -123,7 +125,7 @@ class Search
$raw = mb_substr($raw, 1);
}
if (mb_strlen($clean) < 3 && !Lang::getLocale()->isLogographic())
if (mb_strlen($clean) < 3 && !$allowShort)
{
$this->invalid[] = $raw;
continue;
@ -138,13 +140,9 @@ class Search
{
// cant have trailing/leading dashes. FT confuses them for additional modifiers and dies with a syntax error
// would be an issue for all modifiers, but Filter::PATTERN_FT only allows for - at this point
while (($t[0] ?? '') === '-')
$t = mb_substr($t, 1);
$t = preg_replace('/^-+|-+$/', '', $t);
while (($t[-1] ?? '') === '-')
$t = mb_substr($t, 0, -1);
if (mb_strlen($t) > 2)
if ($allowShort || mb_strlen($t) > 2)
$this->fulltext[] = ($ex ? '-' : '+') . $t . '*';
}
}