diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 7e599458..73d23a55 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -858,9 +858,9 @@ std::unique_ptr InternalServer::handle_no_js(const RequestContext& req htmlDumper.setRootLocation(m_root); htmlDumper.setLibraryId(getLibraryId()); if ( !m_contentServerUrl.empty() ) { - htmlDumper.setContentServerUrl(m_contentServerUrl); + htmlDumper.setContentServerUrl(m_contentServerUrl + "/content"); } else if ( !m_catalogOnlyMode ) { - htmlDumper.setContentServerUrl(m_root); + htmlDumper.setContentServerUrl(m_root + "/content"); } auto userLang = request.get_user_language(); htmlDumper.setUserLanguage(userLang); diff --git a/src/server/internalServer_catalog.cpp b/src/server/internalServer_catalog.cpp index 70754975..69270f30 100644 --- a/src/server/internalServer_catalog.cpp +++ b/src/server/internalServer_catalog.cpp @@ -57,9 +57,9 @@ OPDSDumper InternalServer::getOPDSDumper() const opdsDumper.setRootLocation(m_root); opdsDumper.setLibraryId(getLibraryId()); if ( !m_contentServerUrl.empty() ) { - opdsDumper.setContentServerUrl(m_contentServerUrl); + opdsDumper.setContentServerUrl(m_contentServerUrl + "/content"); } else if ( !m_catalogOnlyMode ) { - opdsDumper.setContentServerUrl(m_root); + opdsDumper.setContentServerUrl(m_root + "/content"); } return opdsDumper; } diff --git a/static/templates/catalog_v2_entry.xml b/static/templates/catalog_v2_entry.xml index f2ede5a7..700d51f3 100644 --- a/static/templates/catalog_v2_entry.xml +++ b/static/templates/catalog_v2_entry.xml @@ -13,7 +13,7 @@ {{#icons}} - {{/icons}}{{#contentServerUrl}} + {{/icons}}{{#contentServerUrl}} {{/contentServerUrl}} {{author_name}} diff --git a/static/templates/no_js_library_page.html b/static/templates/no_js_library_page.html index fdaece84..c1db3b01 100644 --- a/static/templates/no_js_library_page.html +++ b/static/templates/no_js_library_page.html @@ -3,7 +3,6 @@ - {{translations.welcome-to-kiwix-server}} {{translations.count-of-matching-books}} {{#books}}
- {{#contentServerUrl}}{{/contentServerUrl}} + {{#contentServerUrl}}{{/contentServerUrl}}
diff --git a/test/library_server.cpp b/test/library_server.cpp index 03da70a6..6e13394f 100644 --- a/test/library_server.cpp +++ b/test/library_server.cpp @@ -18,11 +18,15 @@ protected: const int PORT = 8002; protected: + void resetServer(ZimFileServer::Cfg cfg) { + zfs1_.reset(); + zfs1_.reset(new ZimFileServer(PORT, cfg, "./test/library.xml")); + } + void resetServer(ZimFileServer::Options options, std::string contentServerUrl="") { ZimFileServer::Cfg cfg(options); cfg.contentServerUrl = contentServerUrl; - zfs1_.reset(); - zfs1_.reset(new ZimFileServer(PORT, cfg, "./test/library.xml")); + resetServer(cfg); } void SetUp() override { @@ -733,7 +737,8 @@ TEST_F(LibraryServerTest, catalog_v2_entries_catalog_only_mode) resetServer(ZimFileServer::CATALOG_ONLY_MODE, contentServerUrl); const auto r = zfs1_->GET("/ROOT%23%3F/catalog/v2/entries"); EXPECT_EQ(r->status, 200); - EXPECT_EQ(maskVariableOPDSFeedData(r->body), + + const std::string expectedOPDS = CATALOG_V2_ENTRIES_PREAMBLE("") " All Entries\n" " YYYY-MM-DDThh:mm:ssZ\n" @@ -742,8 +747,27 @@ TEST_F(LibraryServerTest, catalog_v2_entries_catalog_only_mode) + fixContentLinks(INACCESSIBLEZIMFILE_CATALOG_ENTRY) + fixContentLinks(RAY_CHARLES_CATALOG_ENTRY) + fixContentLinks(UNCATEGORIZED_RAY_CHARLES_CATALOG_ENTRY) + - "\n" - ); + "\n"; + + EXPECT_EQ(maskVariableOPDSFeedData(r->body), expectedOPDS); + + { // test with empty rootLocation + const auto fixRoot = [=](std::string s) -> std::string { + s = replace(s, "/ROOT%23%3F/", "/"); + s = replace(s, "/ROOT%23%3F/", "/"); + return s; + }; + + ZimFileServer::Cfg serverCfg; + serverCfg.root = ""; + serverCfg.options = ZimFileServer::CATALOG_ONLY_MODE; + serverCfg.contentServerUrl = contentServerUrl; + resetServer(serverCfg); + + const auto r = zfs1_->GET("/catalog/v2/entries"); + EXPECT_EQ(r->status, 200); + EXPECT_EQ(maskVariableOPDSFeedData(r->body), fixRoot(expectedOPDS)); + } } TEST_F(LibraryServerTest, catalog_v2_entries_filtered_by_range) @@ -1253,7 +1277,6 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access) " \n" \ " \n" \ " \n" \ - " \n" \ " Welcome to Kiwix Server\n" \ " GET("/ROOT%23%3F/nojs"); EXPECT_EQ(r->status, 200); - EXPECT_EQ(r->body, + + const std::string expectedHTML = HTML_PREAMBLE FILTERS_HTML("") HOME_BODY_TEXT("4") @@ -1567,7 +1592,27 @@ TEST_F(LibraryServerTest, noJS_catalogOnlyMode) { + fixContentLinks(INACCESSIBLEZIMFILE_BOOK_HTML) + fixContentLinks(RAY_CHARLES_BOOK_HTML) + fixContentLinks(RAY_CHARLES_UNCTZ_BOOK_HTML) - + FINAL_HTML_TEXT); + + FINAL_HTML_TEXT; + + EXPECT_EQ(r->body, expectedHTML); + + { // test with empty rootLocation + const auto fixRoot = [=](std::string s) -> std::string { + s = replace(s, "/ROOT%23%3F/", "/"); + return s; + }; + + ZimFileServer::Cfg serverCfg; + serverCfg.root = ""; + serverCfg.options = ZimFileServer::CATALOG_ONLY_MODE; + serverCfg.contentServerUrl = contentServerUrl; + + resetServer(serverCfg); + + auto r = zfs1_->GET("/nojs"); + EXPECT_EQ(r->status, 200); + EXPECT_EQ(r->body, fixRoot(expectedHTML)); + } } #undef EXPECT_SEARCH_RESULTS