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

Search/Fixup

Browse source 
* dashes also split words into multiple tokens, so they are now
   stripped from search entirely (see: 'weather-beaten')
 * only search for the full search input if the tokenizer didn't yield
   any fulltext tokens. This should fix search performance after 00f048d3ae
 * fixes #497
This commit is contained in:
Sarjuuk 2026-02-27 12:02:16 +01:00
parent 297d678270
commit 2161a7b846
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ abstract class Filter
protected const PATTERN_CRV = '/[\p{C};:%\\\\]/ui';
protected const PATTERN_INT = '/\D/';
public const PATTERN_PARAM = '/^[\p{L}\p{Sm} \d\p{P}]+$/ui';
public const PATTERN_FT = '/[^[:alpha:] \d_-]/iu'; // +-*<>@()~" have special meaning; ' seems to fuck up the search; other irregular cases?
public const PATTERN_FT = '/[^[:alpha:] \d_]/iu'; // +-*<>@()~" have special meaning; ' seems to fuck up the search; other irregular cases?
protected const ENUM_FACTION = array( 469, 1037, 1106, 529, 1012, 87, 21, 910, 609, 942, 909, 530, 69, 577, 930, 1068, 1104, 729, 369, 92,
54, 946, 67, 1052, 749, 47, 989, 1090, 1098, 978, 1011, 93, 1015, 1038, 76, 470, 349, 1031, 1077, 809,
@ -629,11 +629,7 @@ abstract class Filter
// note: a fulltext search purely from exclude tokens will return no result
foreach ($fulltext as $ft)
{
// 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
$this->ftTokens[$field][] = ($ex ? '-' : '+') . preg_replace('/^-+|-+$/', '', $ft) . '*';
}
$this->ftTokens[$field][] = ($ex ? '-' : '+') . $ft . '*';
}
}

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

@ -118,11 +118,7 @@ class Search
// note: a fulltext search purely from exclude tokens will return no result
foreach ($fulltext as $ft)
{
// 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
$this->fulltext[] = ($ex ? '-' : '+') . preg_replace('/^-+|-+$/', '', $ft) . '*';
}
$this->fulltext[] = ($ex ? '-' : '+') . $ft . '*';
}
else
$this->invalid[] = $raw;
@ -181,10 +177,9 @@ class Search
$qry = [];
if ($this->fulltext)
$qry = array_map(fn($x) => [$x, $this->fulltext, 'MATCH'], $fields);
$strBak = trim($this->query);
if (mb_strlen($strBak) > 2 || Lang::getLocale()->isLogographic())
$qry = array_merge($qry, array_map(fn($x) => [$x, $strBak], $fields));
else if ($strBak = trim($this->query))
if (mb_strlen($strBak) > 2 || Lang::getLocale()->isLogographic())
$qry = array_map(fn($x) => [$x, $strBak], $fields);
// single cnd?
if (count($qry) > 1)