smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from kiwix/library_filtering_by_empty_query 

Empty query acts as a match-all query
This commit is contained in:
Matthieu Gautier 2021-05-10 10:27:37 +02:00 committed by GitHub
parent 02c3dff142 41276341d0
commit 6aab9b6981
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/library.cpp
View File

@ -327,7 +327,7 @@ bool willSelectEverything(const Xapian::Query& query)
Xapian::Query buildXapianQueryFromFilterQuery(const Filter& filter) Xapian::Query buildXapianQueryFromFilterQuery(const Filter& filter)
{ {
if ( !filter.hasQuery() ) { if ( !filter.hasQuery() || filter.getQuery().empty() ) {
// This is a thread-safe way to construct an equivalent of // This is a thread-safe way to construct an equivalent of
// a Xapian::Query::MatchAll query // a Xapian::Query::MatchAll query
return Xapian::Query(std::string()); return Xapian::Query(std::string());

18
test/library.cpp
View File

@ -479,6 +479,24 @@ TEST_F(LibraryTest, filterByQuery)
} }
TEST_F(LibraryTest, filteringByEmptyQueryReturnsAllEntries)
{
EXPECT_FILTER_RESULTS(kiwix::Filter().query(""),
"An example ZIM archive",
"Encyclopédie de la Tunisie",
"Granblue Fantasy Wiki",
"Géographie par Wikipédia",
"Islam Stack Exchange",
"Mathématiques",
"Movies & TV Stack Exchange",
"Mythology & Folklore Stack Exchange",
"Ray Charles",
"TED talks - Business",
"Tania Louis",
"Wikiquote"
);
}
TEST_F(LibraryTest, filterByCreator) TEST_F(LibraryTest, filterByCreator)
{ {
EXPECT_FILTER_RESULTS(kiwix::Filter().creator("Wikipedia"), EXPECT_FILTER_RESULTS(kiwix::Filter().creator("Wikipedia"),