xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix keyword searches with a quoted string value.

Browse Source 
Before this change curly braces wrapped the keyword and its value, making the pair get treated as leftover words.

Also make the search query modification and CSV parsing a bit clearer with some comments and minor refactoring.
This commit is contained in:
wn_
2024-10-20 16:07:50 +00:00
parent 5ea96397c0
commit 142ca20cb0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
classes/Feeds.php
View File

@@ -2212,7 +2212,13 @@ class Feeds extends Handler_Protected {
* @return array{0: string, 1: array<int, string>} [$search_query_part, $search_words] * @return array{0: string, 1: array<int, string>} [$search_query_part, $search_words]
*/ */
private static function _search_to_sql(string $search, string $search_language, int $owner_uid): array { private static function _search_to_sql(string $search, string $search_language, int $owner_uid): array {
$keywords = str_getcsv(preg_replace('/(-?\w+)\:"(\w+)/', '"{$1}:{$2}', trim($search)), ' ', '"', ''); // Modify the search string so that 'keyword:"foo bar"' becomes '"keyword:foo bar"'.
// This is needed so potential command pairs are grouped correctly.
$search_csv_str = preg_replace('/(-?\w+)\:"(\w+)/', '"$1:$2', trim($search));
// $keywords will be an array like ['"title:hello world"', 'some', 'words']
$keywords = str_getcsv($search_csv_str, ' ', '"', '');
$query_keywords = array(); $query_keywords = array();
$search_words = array(); $search_words = array();
$search_query_leftover = array(); $search_query_leftover = array();
@@ -2271,7 +2277,6 @@ class Feeds extends Handler_Protected {
} }
break; break;
case "star": case "star":
if ($commandpair[1]) { if ($commandpair[1]) {
if ($commandpair[1] == "true") if ($commandpair[1] == "true")
array_push($query_keywords, "($not (marked = true))"); array_push($query_keywords, "($not (marked = true))");