mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 20:22:18 +00:00
Amended search to not break on non-alpha-num chars
And also fixed exact term matches that contain non-alpha-num chars Fixes #212
This commit is contained in:
parent
c4eed37d8e
commit
b251671e3f
@ -160,44 +160,46 @@ class Entity extends Ownable
|
|||||||
public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
|
public function fullTextSearchQuery($fieldsToSearch, $terms, $wheres = [])
|
||||||
{
|
{
|
||||||
$exactTerms = [];
|
$exactTerms = [];
|
||||||
if (count($terms) === 0) {
|
$fuzzyTerms = [];
|
||||||
$search = $this;
|
$search = static::newQuery();
|
||||||
$orderBy = 'updated_at';
|
foreach ($terms as $key => $term) {
|
||||||
} else {
|
$safeTerm = htmlentities($term, ENT_QUOTES);
|
||||||
foreach ($terms as $key => $term) {
|
$safeTerm = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $safeTerm);
|
||||||
$term = htmlentities($term, ENT_QUOTES);
|
if (preg_match('/".*?"/', $safeTerm) || is_numeric($safeTerm)) {
|
||||||
$term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
|
$safeTerm = preg_replace('/^"(.*?)"$/', '$1', $term);
|
||||||
if (preg_match('/".*?"/', $term)) {
|
$exactTerms[] = '%' . $safeTerm . '%';
|
||||||
$term = str_replace('"', '', $term);
|
} else {
|
||||||
$exactTerms[] = '%' . $term . '%';
|
$safeTerm = '' . $safeTerm . '*';
|
||||||
$term = '"' . $term . '"';
|
if (trim($safeTerm) !== '*') $fuzzyTerms[] = $safeTerm;
|
||||||
} else {
|
|
||||||
$term = '' . $term . '*';
|
|
||||||
}
|
|
||||||
if ($term !== '*') $terms[$key] = $term;
|
|
||||||
}
|
}
|
||||||
$termString = implode(' ', $terms);
|
}
|
||||||
$fields = implode(',', $fieldsToSearch);
|
$isFuzzy = count($exactTerms) === 0 || count($fuzzyTerms) > 0;
|
||||||
$search = static::selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
|
|
||||||
$search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
|
|
||||||
|
|
||||||
// Ensure at least one exact term matches if in search
|
// Perform fulltext search if relevant terms exist.
|
||||||
if (count($exactTerms) > 0) {
|
if ($isFuzzy) {
|
||||||
$search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
|
$termString = implode(' ', $fuzzyTerms);
|
||||||
foreach ($exactTerms as $exactTerm) {
|
$fields = implode(',', $fieldsToSearch);
|
||||||
foreach ($fieldsToSearch as $field) {
|
$search = $search->selectRaw('*, MATCH(name) AGAINST(? IN BOOLEAN MODE) AS title_relevance', [$termString]);
|
||||||
$query->orWhere($field, 'like', $exactTerm);
|
$search = $search->whereRaw('MATCH(' . $fields . ') AGAINST(? IN BOOLEAN MODE)', [$termString]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ensure at least one exact term matches if in search
|
||||||
|
if (count($exactTerms) > 0) {
|
||||||
|
$search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) {
|
||||||
|
foreach ($exactTerms as $exactTerm) {
|
||||||
|
foreach ($fieldsToSearch as $field) {
|
||||||
|
$query->orWhere($field, 'like', $exactTerm);
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
}
|
});
|
||||||
$orderBy = 'title_relevance';
|
}
|
||||||
};
|
$orderBy = $isFuzzy ? 'title_relevance' : 'updated_at';
|
||||||
|
|
||||||
// Add additional where terms
|
// Add additional where terms
|
||||||
foreach ($wheres as $whereTerm) {
|
foreach ($wheres as $whereTerm) {
|
||||||
$search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
|
$search->where($whereTerm[0], $whereTerm[1], $whereTerm[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load in relations
|
// Load in relations
|
||||||
if ($this->isA('page')) {
|
if ($this->isA('page')) {
|
||||||
$search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
|
$search = $search->with('book', 'chapter', 'createdBy', 'updatedBy');
|
||||||
|
Loading…
Reference in New Issue
Block a user