From 965b9622c2e829bd6695697f2ebca5f959bcc694 Mon Sep 17 00:00:00 2001 From: Manan Jethwani Date: Tue, 20 Apr 2021 01:36:54 +0530 Subject: [PATCH] removed redirect to articles in search --- src/server/internalServer.cpp | 24 ------------------------ test/server.cpp | 8 -------- 2 files changed, 32 deletions(-) diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 0566bec28..ad448bf2f 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -497,30 +497,6 @@ std::unique_ptr InternalServer::handle_search(const RequestContext& re reader = mp_library->getReaderById(bookId); } catch (const std::out_of_range&) {} - /* Try first to load directly the article */ - if (reader != nullptr && !patternString.empty()) { - std::string patternCorrespondingUrl; - auto variants = reader->getTitleVariants(patternString); - auto variantsItr = variants.begin(); - - while (patternCorrespondingUrl.empty() && variantsItr != variants.end()) { - try { - auto entry = reader->getEntryFromTitle(*variantsItr); - entry = entry.getFinalEntry(); - patternCorrespondingUrl = entry.getPath(); - break; - } catch(kiwix::NoEntry& e) { - variantsItr++; - } - } - - /* If article found then redirect directly to it */ - if (!patternCorrespondingUrl.empty()) { - auto redirectUrl = m_root + "/" + bookName + "/" + patternCorrespondingUrl; - return Response::build_redirect(*this, redirectUrl); - } - } - /* Make the search */ if ( (!reader && !bookName.empty()) || (patternString.empty() && ! has_geo_query) ) { diff --git a/test/server.cpp b/test/server.cpp index e6df02474..901ad193f 100644 --- a/test/server.cpp +++ b/test/server.cpp @@ -269,14 +269,6 @@ TEST_F(ServerTest, 404) EXPECT_EQ(404, zfs1_->GET(url)->status) << "url: " << url; } -TEST_F(ServerTest, SuccessfulSearchForAnArticleTitleRedirectsToTheArticle) -{ - auto g = zfs1_->GET("/search?content=zimfile&pattern=ray%20charles" ); - ASSERT_EQ(302, g->status); - ASSERT_TRUE(g->has_header("Location")); - ASSERT_EQ("/zimfile/A/Ray_Charles", g->get_header_value("Location")); -} - TEST_F(ServerTest, RandomPageRedirectsToAnExistingArticle) { auto g = zfs1_->GET("/random?content=zimfile");