public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-23 01:01:27 +00:00
Code Issues Releases Wiki Activity

filter_test: proper implementation using queryFeedHeadlines

Browse Source
This commit is contained in:
Andrew Dolgov
2011-04-18 13:04:24 +04:00
parent 452a329b97
commit 361840203b
2 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
functions.php
View File

@@ -2338,7 +2338,7 @@
}
function sql_bool_to_bool($s) {
if ($s == "t" || $s == "1") {
if ($s == "t" || $s == "1" || $s == "true") {
return true;
} else {
return false;
@@ -3369,7 +3369,7 @@
return $search_query_part;
}
function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0) {
function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
@@ -3394,6 +3394,12 @@
$search_query_part = "";
}
if ($filter) {
$filter_query_part = filter_to_sql($filter);
} else {
$filter_query_part = "";
}
$view_query_part = "";
if ($view_mode == "adaptive" || $view_query_part == "noscores") {
@@ -3623,6 +3629,7 @@
ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_user_entries.owner_uid = '$owner_uid' AND
$search_query_part
$filter_query_part
$view_query_part
$query_strategy_part ORDER BY $order_by
$limit_query_part $offset_query_part";
@@ -7245,4 +7252,58 @@
return $result;
}
function filter_to_sql($filter) {
$query = "";
if (DB_TYPE == "pgsql")
$reg_qpart = "~";
else
$reg_qpart = "REGEXP";
switch ($filter["type"]) {
case "title":
$query = "LOWER(ttrss_entries.title) $reg_qpart LOWER('".
$filter['reg_exp'] . "')";
break;
case "content":
$query = "LOWER(ttrss_entries.content) $reg_qpart LOWER('".
$filter['reg_exp'] . "')";
break;
case "both":
$query = "LOWER(ttrss_entries.title) $reg_qpart LOWER('".
$filter['reg_exp'] . "') OR LOWER(" .
"ttrss_entries.content) $reg_qpart LOWER('" . $filter['reg_exp'] . "')";
break;
case "tag":
$query = "LOWER(ttrss_user_entries.tag_cache) $reg_qpart LOWER('".
$filter['reg_exp'] . "')";
break;
case "link":
$query = "LOWER(ttrss_entries.link) $reg_qpart LOWER('".
$filter['reg_exp'] . "')";
break;
case "date":
if ($filter["filter_param"] == "before")
$cmp_qpart = "<";
else
$cmp_qpart = ">=";
$timestamp = date("Y-m-d H:N:s", strtotime($filter["reg_exp"]));
$query = "ttrss_entries.date_entered $cmp_qpart '$timestamp'";
break;
case "author":
$query = "LOWER(ttrss_entries.author) $reg_qpart LOWER('".
$filter['reg_exp'] . "')";
break;
}
if ($filter["inverse"])
$query = "NOT ($query)";
if ($query)
$query .= " AND ";
return $query;
}
?>