valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefs: rudimentary multiple keyword search

This commit is contained in:
Andrew Dolgov 2009-10-07 15:12:21 +04:00
parent 4b67e71e7d
commit 1638fc4e13
4 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/pref-feeds.php
View File

@ -1184,9 +1184,21 @@
$_SESSION["pref_sort_feeds"] = $feeds_sort; $_SESSION["pref_sort_feeds"] = $feeds_sort;
if ($feed_search) { if ($feed_search) {
$search_qpart = "(UPPER(F1.title) LIKE UPPER('%$feed_search%') OR
UPPER(C1.title) LIKE UPPER('%$feed_search%') OR $feed_search = split(" ", $feed_search);
UPPER(F1.feed_url) LIKE UPPER('%$feed_search%')) AND"; $tokens = array();
foreach ($feed_search as $token) {
$token = trim($token);
array_push($tokens, "(UPPER(F1.title) LIKE UPPER('%$token%') OR
UPPER(C1.title) LIKE UPPER('%$token%') OR
UPPER(F1.feed_url) LIKE UPPER('%$token%'))");
}
$search_qpart = "(" . join($tokens, " AND ") . ") AND ";
} else { } else {
$search_qpart = ""; $search_qpart = "";
} }

24
modules/pref-filters.php
View File

@ -324,13 +324,23 @@
value=\"".__('Rescore articles')."\">"; value=\"".__('Rescore articles')."\">";
if ($filter_search) { if ($filter_search) {
$filter_search = db_escape_string($filter_search); $filter_search = split(' ', db_escape_string($filter_search));
$filter_search_query = "(
UPPER(ttrss_filter_actions.description) LIKE UPPER('%$filter_search%') OR $tokens = array();
UPPER(reg_exp) LIKE UPPER('%$filter_search%') OR
UPPER(action_param) LIKE UPPER('%$filter_search%') OR foreach ($filter_search as $token) {
UPPER(ttrss_feeds.title) LIKE UPPER('%$filter_search%') OR $token = trim($token);
UPPER(ttrss_filter_types.description) LIKE UPPER('%$filter_search%')) AND";
array_push($tokens, "(
UPPER(ttrss_filter_actions.description) LIKE UPPER('%$token%') OR
UPPER(reg_exp) LIKE UPPER('%$token%') OR
UPPER(action_param) LIKE UPPER('%$token%') OR
UPPER(ttrss_feeds.title) LIKE UPPER('%$token%') OR
UPPER(ttrss_filter_types.description) LIKE UPPER('%$token%'))");
}
$filter_search_query = "(" . join($tokens, " AND ") . ") AND ";
} else { } else {
$filter_search_query = ""; $filter_search_query = "";
} }

14
modules/pref-labels.php
View File

@ -138,7 +138,19 @@
value=\"".__('Create label')."\"></div>"; value=\"".__('Create label')."\"></div>";
if ($label_search) { if ($label_search) {
$label_search_query = "caption LIKE '%$label_search%' AND";
$label_search = split(" ", $label_search);
$tokens = array();
foreach ($label_search as $token) {
$token = trim($token);
array_push($tokens, "(UPPER(caption) LIKE UPPER('%$token%'))");
}
$label_search_query = "(" . join($tokens, " AND ") . ") AND ";
} else { } else {
$label_search_query = ""; $label_search_query = "";
} }

12
modules/pref-users.php
View File

@ -374,7 +374,17 @@
onclick=\"javascript:addUser()\" value=\"".__('Create user')."\"></div>"; onclick=\"javascript:addUser()\" value=\"".__('Create user')."\"></div>";
if ($user_search) { if ($user_search) {
$user_search_query = "UPPER(login) LIKE UPPER('%$user_search%') AND";
$user_search = split(" ", $user_search);
$tokens = array();
foreach ($user_search as $token) {
$token = trim($token);
array_push($tokens, "(UPPER(login) LIKE UPPER('%$token%'))");
}
$user_search_query = "(" . join($tokens, " AND ") . ") AND ";
} else { } else {
$user_search_query = ""; $user_search_query = "";
} }