mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-10-11 11:01:17 +02:00
Code Issues Projects Releases Wiki Activity

Support using phrases in searches (PostgreSQL only).

Browse Source
This commit is contained in:
wn_ 2025-03-18 00:16:09 +00:00
parent 6f9429f405
commit 434da183e7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/Feeds.php
View File

@ -2143,6 +2143,9 @@ class Feeds extends Handler_Protected {
// This is needed so potential command pairs are grouped correctly. // This is needed so potential command pairs are grouped correctly.
$search_csv_str = preg_replace('/(-?\w+)\:"(\w+)/', '"$1:$2', trim($search)); $search_csv_str = preg_replace('/(-?\w+)\:"(\w+)/', '"$1:$2', trim($search));
// '-"hello world"' --> '"-hello world"' so negated phrases work
$search_csv_str = preg_replace('/-"([^"]+?")/', '"-$1', $search_csv_str);
// $keywords will be an array like ['"title:hello world"', 'some', 'words'] // $keywords will be an array like ['"title:hello world"', 'some', 'words']
$keywords = str_getcsv($search_csv_str, ' ', '"', ''); $keywords = str_getcsv($search_csv_str, ' ', '"', '');
@ -2161,6 +2164,8 @@ class Feeds extends Handler_Protected {
$not = ""; $not = "";
} }
$k = trim($k);
$keyword_pair = explode(':', mb_strtolower($k), 2); $keyword_pair = explode(':', mb_strtolower($k), 2);
$keyword_name = $keyword_pair[0]; $keyword_name = $keyword_pair[0];
$keyword_value = empty($keyword_pair[1]) ? '' : trim($keyword_pair[1]); $keyword_value = empty($keyword_pair[1]) ? '' : trim($keyword_pair[1]);
@ -2265,22 +2270,21 @@ class Feeds extends Handler_Protected {
$orig_ts = strtotime(substr($k, 1)); $orig_ts = strtotime(substr($k, 1));
$k = date("Y-m-d", TimeHelper::convert_timestamp($orig_ts, $user_tz_string, 'UTC')); $k = date("Y-m-d", TimeHelper::convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
//$k = date("Y-m-d", strtotime(substr($k, 1)));
array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH(".$pdo->quote($k).")) $not = ".$pdo->quote($k).")"); array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH(".$pdo->quote($k).")) $not = ".$pdo->quote($k).")");
} else { } else {
// treat as leftover text // treat as leftover text
// TODO: handle multiword strings in the fulltext search
$k = mb_strtolower($k); $k = mb_strtolower($k);
if (Config::get(Config::DB_TYPE) == "pgsql") { if (Config::get(Config::DB_TYPE) == "pgsql") {
// A hacky way for phrases (e.g. "hello world") to get through PDO quoting.
// Term '"foo bar baz"' becomes '(foo <-> bar <-> baz)' ("<->" meaning "immediately followed by").
if (preg_match('/\s+/', $k))
$k = '(' . preg_replace('/\s+/', ' <-> ', $k) . ')';
array_push($search_query_leftover, $not ? "!$k" : $k); array_push($search_query_leftover, $not ? "!$k" : $k);
} else { } else {
array_push($search_query_leftover, $not ? "-$k" : $k); array_push($search_query_leftover, $not ? "-$k" : $k);
//array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
// OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
} }
if (!$not) array_push($search_words, $k); if (!$not) array_push($search_words, $k);