Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved numeric term search capabilities

Browse Source 
Prevented a quoted term also being added to fuzzy searches
and also added check to see if the term is numeric to check if
an exact match is required.

Closes #200
This commit is contained in:
Dan Brown 2016-09-29 09:13:15 +01:00
parent da10c50945
commit 42d8e9e5bd
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/Entity.php
View File

@ -160,44 +160,49 @@ 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';
} else {
foreach ($terms as $key => $term) {
$term = htmlentities($term, ENT_QUOTES);
$term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
if (preg_match('/&quot;.*?&quot;/', $term)) {
$term = str_replace('&quot;', '', $term);
$exactTerms[] = '%' . $term . '%';
$term = '"' . $term . '"';
} else {
$term = '' . $term . '*';
}
if ($term !== '*') $terms[$key] = $term;
}
$termString = implode(' ', $terms);
$fields = implode(',', $fieldsToSearch);
$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 foreach ($terms as $key => $term) {
if (count($exactTerms) > 0) { $term = htmlentities($term, ENT_QUOTES);
$search = $search->where(function ($query) use ($exactTerms, $fieldsToSearch) { $term = preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $term);
foreach ($exactTerms as $exactTerm) { if (preg_match('/&quot;.*?&quot;/', $term) || is_numeric($term)) {
foreach ($fieldsToSearch as $field) { $term = str_replace('&quot;', '', $term);
$query->orWhere($field, 'like', $exactTerm); $exactTerms[] = '%' . $term . '%';
} } else {
} $term = '' . $term . '*';
}); if ($term !== '*') $fuzzyTerms[] = $term;
} }
$orderBy = 'title_relevance'; }
};
$isFuzzy = count($exactTerms) === 0 || count($fuzzyTerms) > 0;
// Perform fulltext search if relevant terms exist.
if ($isFuzzy) {
$termString = implode(' ', $fuzzyTerms);
$fields = implode(',', $fieldsToSearch);
$search = $search->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
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 = $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');