tastytea
/
remwharead
1
0
Fork 0
Code Issues 1 Pull Requests Releases 37 Activity

Removed alias DB = Database.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2019-09-30 13:24:00 +02:00
parent 2c4fb47f63
commit 61aa6b4653
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sqlite.hpp
View File

@ -112,8 +112,6 @@ private:
std::unique_ptr<Session> _session; std::unique_ptr<Session> _session;
bool _connected; bool _connected;
}; };
using DB = Database;
} // namespace remwharead } // namespace remwharead
#endif // REMWHAREAD_SQLITE_HPP #endif // REMWHAREAD_SQLITE_HPP

15
src/lib/search.cpp
View File

@ -83,15 +83,16 @@ string Search::to_lowercase(const string &str) const
return Poco::UTF8::toLower(str); return Poco::UTF8::toLower(str);
} }
list<DB::entry> Search::search_tags(const string &expression, const bool is_re) list<Database::entry> Search::search_tags(const string &expression,
const bool is_re)
const const
{ {
vector<vector<string>> searchlist = parse_expression(expression); vector<vector<string>> searchlist = parse_expression(expression);
list<DB::entry> result; list<Database::entry> result;
for (const vector<string> &tags_or : searchlist) for (const vector<string> &tags_or : searchlist)
{ {
for (const DB::entry &entry : _entries) for (const Database::entry &entry : _entries)
{ // Add entry to result if all tags in an OR-slice match. { // Add entry to result if all tags in an OR-slice match.
bool matched = true; bool matched = true;
@ -125,15 +126,15 @@ list<DB::entry> Search::search_tags(const string &expression, const bool is_re)
return result; return result;
} }
list<DB::entry> Search::search_all(const string &expression, list<Database::entry> Search::search_all(const string &expression,
const bool is_re) const const bool is_re) const
{ {
vector<vector<string>> searchlist = parse_expression(expression); vector<vector<string>> searchlist = parse_expression(expression);
list<DB::entry> result = search_tags(expression, is_re); list<Database::entry> result = search_tags(expression, is_re);
for (const vector<string> &terms_or : searchlist) for (const vector<string> &terms_or : searchlist)
{ {
for (const DB::entry &entry : _entries) for (const Database::entry &entry : _entries)
{ {
// Add entry to result if all terms in an OR-slice match title, // Add entry to result if all terms in an OR-slice match title,
// description or full text. // description or full text.