From be6b58c6ade7b09cd8145bd8134077233a4af4e5 Mon Sep 17 00:00:00 2001 From: Maneesh P M Date: Sun, 9 May 2021 10:47:18 +0530 Subject: [PATCH] Revert "added 204 code for empty return of search" Returning status code 204 in case of an empty results doesn't show the empty results page as described in #466. Reverting the changes in #396 fixes the issue. --- src/server/internalServer.cpp | 7 +------ test/server.cpp | 9 --------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index ad448bf2f..3e0639650 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -555,11 +555,6 @@ std::unique_ptr InternalServer::handle_search(const RequestContext& re renderer.setPageLength(pageLength); auto response = ContentResponse::build(*this, renderer.getHtml(), "text/html; charset=utf-8"); response->set_taskbar(bookName, reader ? reader->getTitle() : ""); - //changing status code if no result obtained - if(searcher.getEstimatedResultCount() == 0) - { - response->set_code(MHD_HTTP_NO_CONTENT); - } return std::move(response); } catch (const std::exception& e) { @@ -765,7 +760,7 @@ std::unique_ptr InternalServer::handle_content(const RequestContext& r std::string searchURL = m_root+"/search?pattern="+pattern; // Make a full search on the entire library. const std::string details = searchSuggestionHTML(searchURL, kiwix::urlDecode(pattern)); - return Response::build_404(*this, request, bookName, details); + return Response::build_404(*this, request, bookName, details); } auto urlStr = request.get_url().substr(bookName.size()+1); diff --git a/test/server.cpp b/test/server.cpp index 901ad193f..759c7e5b3 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -216,15 +216,6 @@ TEST_F(ServerTest, 200) EXPECT_EQ(200, zfs1_->GET(res.url)->status) << "res.url: " << res.url; } -// seperate test for 204 code - -TEST_F(ServerTest, EmptySearchReturnsA204StatusCode) -{ - const char* url="/search?content=zimfile&pattern=abcd"; - auto res=zfs1_->GET(url); - EXPECT_EQ(204, res->status) << "res.url: " << url; -} - TEST_F(ServerTest, CompressibleContentIsCompressedIfAcceptable) { for ( const Resource& res : resources200Compressible ) {