mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-27 21:48:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Light Boolean search implementation (#1828)

Browse Source 
* Light Boolean search implementation

"Hello intitle:World OR date:P1D example"
https://github.com/FreshRSS/FreshRSS/issues/879

* Doc Boolean search

* Doc typos
This commit is contained in:
Alexandre Alapetite authored and GitHub committed 2018-03-14 17:20:41 +01:00
1 parent 881ed44005
commit 84d891f8cf
9 files changed
+172 -95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Models/EntryDAOSQLite.php
+4 -4
View File
@@ -159,7 +159,7 @@ DROP TABLE IF EXISTS `tmp`;
* @param integer $priorityMin
* @return integer affected rows
*/
public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0, $filter = null, $state = 0) {
public function markReadEntries($idMax = 0, $onlyFavorites = false, $priorityMin = 0, $filters = null, $state = 0) {
if ($idMax == 0) {
$idMax = time() . '000000';
Minz_Log::debug('Calling markReadEntries(0) is deprecated!');
@@ -173,7 +173,7 @@ DROP TABLE IF EXISTS `tmp`;
}
$values = array($idMax);
list($searchValues, $search) = $this->sqlListEntriesWhere('', $filter, $state);
list($searchValues, $search) = $this->sqlListEntriesWhere('', $filters, $state);
$stm = $this->bd->prepare($sql . $search);
if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {
@@ -199,7 +199,7 @@ DROP TABLE IF EXISTS `tmp`;
* @param integer $idMax fail safe article ID
* @return integer affected rows
*/
public function markReadCat($id, $idMax = 0, $filter = null, $state = 0) {
public function markReadCat($id, $idMax = 0, $filters = null, $state = 0) {
if ($idMax == 0) {
$idMax = time() . '000000';
Minz_Log::debug('Calling markReadCat(0) is deprecated!');
@@ -211,7 +211,7 @@ DROP TABLE IF EXISTS `tmp`;
. 'id_feed IN (SELECT f.id FROM `' . $this->prefix . 'feed` f WHERE f.category=?)';
$values = array($idMax, $id);
list($searchValues, $search) = $this->sqlListEntriesWhere('', $filter, $state);
list($searchValues, $search) = $this->sqlListEntriesWhere('', $filters, $state);
$stm = $this->bd->prepare($sql . $search);
if (!($stm && $stm->execute(array_merge($values, $searchValues)))) {