Merge pull request #1262 from kiwix/carriage-return-after-error

Carriage return after error

ChangeLog

@@ -1,3 +1,31 @@
+libkiwix 14.1.1
+===============
+
+* Server:
+  - Fix regression for kiwix-serve --nosearchbar (@veloman-yunkan #1250)
+  - Avoid results content interpretation... crash in fulltext search (@vighnesh-sawant #1241)
+  - Fix for intermittent /content/blank.html errors (@veloman-yunkan #1249)
+
+libkiwix 14.1.0
+===============
+
+ * Server:
+  - Viewer detects & tracks intrapage navigation anchors too (@veloman-yunkan #1213)
+  - Add support for catalog only mode (@veloman-yunkan #1219)
+  - Add API which returns server access url (@vighnesh-sawant #1234)
+  - Fix chrome searchbar placeholder text overflow (@aditii2712 #1185)
+  - Fix magnet link queryStyring (@rgaudin #1160)
+  - Improve chrome printing stylesheet (@kelson42 #1202)
+  - Default white background (@kelson42 #1205)
+
+ * Other:
+  - Switched to the new libzim illustrations API (@veloman-yunkan #1226)
+  - Stop building Windows with DEBUG symbols in CI (@kelson42 #1165)
+  - Update many things in the CI/CD (@kelson42 #1203 #1194 #1209 #1207 #1235)
+  - Requires now libzim 9.4.0 (@kelson42 #1231)
+  - Fix compilation for FreeBSD (@OICe2 #1173 #1174)
+  - Wait up to 1s to let aria2c to start before complaining (@kelson42 #1169)
+
 libkiwix 14.0.0
 ===============
 

include/server.h

@@ -69,6 +69,7 @@ namespace kiwix
        int getPort() const;
        IpAddress getAddress() const;
        IpMode getIpMode() const;
+       std::vector<std::string> getServerAccessUrls() const;
 
      protected:
        std::shared_ptr<Library> mp_library;

meson.build

@@ -1,5 +1,5 @@
 project('libkiwix', 'cpp',
-  version : '14.0.0',
+  version : '14.1.1',
   license : 'GPLv3+',
   default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
 

src/book.cpp

@@ -242,7 +242,7 @@ const std::string& Book::Illustration::getData() const
       try {
         data = download(url);
       } catch(...) {
-        std::cerr << "Cannot download favicon from " << url;
+        std::cerr << "Cannot download favicon from " << url << std::endl;
       }
     }
   }

src/server.cpp

@@ -29,6 +29,22 @@
 
 namespace kiwix {
 
+namespace
+{
+
+std::string makeServerUrl(std::string host, int port, std::string root)
+{
+  const int httpDefaultPort = 80;
+
+  if (port == httpDefaultPort) {
+    return "http://" + host + root;
+  } else {
+    return "http://" + host + ":" + std::to_string(port) + root;
+  }
+}
+
+}  // unnamed namespace
+
 Server::Server(LibraryPtr library, std::shared_ptr<NameMapper> nameMapper) :
   mp_library(library),
   mp_nameMapper(nameMapper),
@@ -56,7 +72,13 @@ bool Server::start() {
     m_ipConnectionLimit,
     m_catalogOnlyMode,
     m_contentServerUrl));
-  return mp_server->start();
+  if (mp_server->start()) {
+    // this syncs m_addr of InternalServer and Server as they may diverge
+    m_addr = mp_server->getAddress();
+    return true;
+  } else {
+    return false;
+  }
 }
 
 void Server::stop() {
@@ -69,12 +91,12 @@ void Server::stop() {
 void Server::setRoot(const std::string& root)
 {
   m_root = root;
-  if (m_root[0] != '/') {
-    m_root = "/" + m_root;
-  }
-  if (m_root.back() == '/') {
-    m_root.erase(m_root.size() - 1);
-  }
+  while (!m_root.empty() && m_root.back() == '/')
+    m_root.pop_back();
+
+  while (!m_root.empty() && m_root.front() == '/')
+    m_root = m_root.substr(1);
+  m_root = m_root.empty() ? m_root : "/" + m_root;
 }
 
 void Server::setAddress(const std::string& addr)
@@ -93,12 +115,12 @@ void Server::setAddress(const std::string& addr)
 
 int Server::getPort() const
 {
-  return mp_server->getPort();
+  return m_port;
 }
 
 IpAddress Server::getAddress() const
 {
-  return mp_server->getAddress();
+  return m_addr;
 }
 
 IpMode Server::getIpMode() const
@@ -106,4 +128,16 @@ IpMode Server::getIpMode() const
   return mp_server->getIpMode();
 }
 
+std::vector<std::string> Server::getServerAccessUrls() const
+{
+  std::vector<std::string> result;
+  if (!m_addr.addr.empty()) {
+    result.push_back(makeServerUrl(m_addr.addr, m_port, m_root));
+  }
+  if (!m_addr.addr6.empty()) {
+    result.push_back(makeServerUrl("[" + m_addr.addr6 + "]", m_port, m_root));
+  }
+  return result;
+}
+
 }

src/server/internalServer.cpp

@@ -99,16 +99,6 @@ bool ipAvailable(const std::string addr)
   return false;
 }
 
-inline std::string normalizeRootUrl(std::string rootUrl)
-{
-  while ( !rootUrl.empty() && rootUrl.back() == '/' )
-    rootUrl.pop_back();
-
-  while ( !rootUrl.empty() && rootUrl.front() == '/' )
-    rootUrl = rootUrl.substr(1);
-  return rootUrl.empty() ? rootUrl : "/" + rootUrl;
-}
-
 std::string
 fullURL2LocalURL(const std::string& fullUrl, const std::string& rootLocation)
 {
@@ -440,7 +430,7 @@ InternalServer::InternalServer(LibraryPtr library,
                                std::string contentServerUrl) :
   m_addr(addr),
   m_port(port),
-  m_root(normalizeRootUrl(root)),
+  m_root(root),
   m_rootPrefixOfDecodedURL(m_root),
   m_nbThreads(nbThreads),
   m_multizimSearchLimit(multizimSearchLimit),

static/skin/i18n/el.json

@@ -1,13 +1,18 @@
 {
 	"@metadata": {
 		"authors": [
+			"Jimkats",
 			"Kelson",
 			"Norhorn",
 			"Ανώνυμος Βικιπαιδιστής"
 		]
 	},
 	"name": "Αγγλικά",
+	"suggest-full-text-search": "περιέχει '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Δεν υπάρχει τέτοιο βιβλίο: {{BOOK_NAME}}",
+	"caution-warning": "Προσοχή!",
+	"search-result-book-info": "από {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} λέξεις",
 	"welcome-page-overzealous-filter": "Κανένα αποτέλεσμα. Θέλετε να <a href=\"{{URL}}\">επαναφέρετε το φίλτρο</a>;",
 	"powered-by-kiwix-html": "Με την υποστήριξη by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Αναζήτηση",
@@ -19,10 +24,10 @@
 	"direct-download-alt-text": "άμεση λήψη",
 	"hash-download-alt-text": "λήψη αναγνωριστικού",
 	"magnet-alt-text": "λήψη μαγνήτη",
-	"torrent-download-link-text": "Αρχείο torrent",
-	"torrent-download-alt-text": "λήψη torrent",
-	"filter-by-tag": "Φίλτρο ανά ετικέτα \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Διακοπή φίλτρου ανά ετικέτα \"{{TAG}}\"",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Λήψη μέσω BitTorrent",
+	"filter-by-tag": "Φιλτράρισμα κατά ετικέτα \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Διακοπή φιλτραρίσματος κατά ετικέτα \"{{{TAG}}}\"",
 	"welcome-to-kiwix-server": "Καλώς ορίσατε στον διακομιστή Kiwix",
 	"download-links-heading": "Λήψη συνδέσμων για <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Κατεβάστε το βιβλίο",

static/skin/i18n/mk.json

@@ -26,10 +26,21 @@
 	"new-404-page-heading": "Ах! Страницата не е пронајдена.",
 	"404-img-text": "Не е најдено!",
 	"path-was-not-found": "Не ја најдов побараната патека:",
+	"404-advice.p1": "Содржината што ја барате може сепак да е достапна, но може да се наоѓа на друго место во рамките на ZIM-податотеката.",
+	"404-advice.p2": "Ве молиме:",
+	"404-advice.p3": "Пробајте да ја употребите функцијата за пребарување за да ја најдете содржината што ви треба",
+	"404-advice.p4": "Барајте клучни зборови или наслови поврзани со информациите што ви требаат",
+	"404-advice.p5": "Овој приод треба да ви помогне да ја најдете саканата содржина, дури и ако изворната врска не работи правилно.",
 	"500-page-title": "Внатрешна грешка во опслужувачот",
-	"500-page-heading": "Внатрешна грешка во опслужувачот",
-	"500-page-text": "Настана внатрешна грешка во опслужувачот. Жал ни е :/",
+	"500-page-heading": "Страницата не работи.",
+	"500-page-text": "Побараната патека не може правилно да се достави:",
+	"500-img-text": "Страницата не работи.",
+	"external-link-detected": "Најдена е надворешна врска",
 	"caution-warning": "Внимание!",
+	"external-link-intro": "На пат сте да го напуштите ZIM-читачот на Кивикс за да појдете на",
+	"external-link-advice.p1": "Врската што пробувате да ја отворите не е дел од вашиот вонмрежен пакет и бара семрежна врска.",
+	"external-link-advice.p2": "Ако можете да се поврзете со семрежнето, пробајте да ја отворите врската.",
+	"external-link-advice.p3": "Во спротивно можете повторно да пробате да ја отворите вонмрежната содржина на вашиот ZIM стискајќи на копчето за враќање назад на вашиот прелистувач.",
 	"fulltext-search-unavailable": "Целотекстното пребарување е недостапно",
 	"no-search-results": "Погонот за целотекстно пребарување не е достапен за оваа содржина.",
 	"search-results-page-title": "Пребарување: {{SEARCH_PATTERN}}",
@@ -38,9 +49,9 @@
 	"search-result-book-info": "од {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} зборови",
 	"library-button-text": "Оди на воведната страница",
-	"home-button-text": "Оди на главната страница на „{{BOOK_TITLE}}“",
+	"home-button-text": "Оди на главната страница на „{{{BOOK_TITLE}}}“",
 	"random-page-button-text": "Оди на случајно избрана страница",
-	"searchbox-tooltip": "Пребарај го „{{BOOK_TITLE}}“",
+	"searchbox-tooltip": "Пребарај по „{{{BOOK_TITLE}}}“",
 	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход.",
 	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"{{URL}}\">поништите филтерот</a>?",
 	"powered-by-kiwix-html": "Овозможено од&nbsp;<a href=\"https://kiwix.org\">Кивикс</a>",

static/skin/i18n/sv.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Apq",
 			"Jopparn",
 			"Larsa",
 			"Rofiatmustapha12",
@@ -25,9 +26,25 @@
 	"400-page-heading": "Ogiltig begäran",
 	"404-page-title": "Innehållet hittades inte",
 	"404-page-heading": "Hittades inte",
+	"new-404-page-title": "Sidan kunde inte hittas",
+	"new-404-page-heading": "Hoppsan. Sidan hittades inte.",
+	"404-img-text": "Hittades ej!",
+	"path-was-not-found": "Den begärda sökvägen hittades ej:",
+	"404-advice.p1": "Innehållet du letar efter kan fortfarande vara tillgängligt, men det kan finnas på en annan plats i ZIM-filen.",
+	"404-advice.p2": "Vänligen:",
+	"404-advice.p3": "Försök att använda sökfunktionen för att hitta det innehåll du vill ha",
+	"404-advice.p4": "Leta efter nyckelord eller titlar relaterade till den information du söker",
+	"404-advice.p5": "Den här metoden bör hjälpa dig att hitta önskat innehåll, även om den ursprungliga länken inte fungerar korrekt.",
 	"500-page-title": "Internt serverfel",
-	"500-page-heading": "Internt serverfel",
-	"500-page-text": "Ett internt serverfel uppstod. Vi ber om ursäkt för det :/",
+	"500-page-heading": "Hoppsan. Sidan fungerar inte.",
+	"500-page-text": "Den begärda sökvägen kan inte levereras korrekt:",
+	"500-img-text": "Sidan fungerar ej",
+	"external-link-detected": "Extern länk upptäckt",
+	"caution-warning": "Varning!",
+	"external-link-intro": "Du är på väg att lämna Kiwix ZIM-läsare för att gå online till",
+	"external-link-advice.p1": "Länken du försöker komma åt är inte en del av ditt offlinepaket och kräver en internetanslutning.",
+	"external-link-advice.p2": "Om du kan gå online kan du försöka öppna länken.",
+	"external-link-advice.p3": "Du kan annars återgå till ditt ZIM-innehåll offline genom att använda webbläsarens bakåtknapp.",
 	"fulltext-search-unavailable": "Fulltextsökning är inte tillgänglig",
 	"no-search-results": "Sökmaskinen för fulltext är inte tillgänglig för detta innehåll.",
 	"search-results-page-title": "Sök: {{SEARCH_PATTERN}}",
@@ -36,9 +53,9 @@
 	"search-result-book-info": "från {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} ord",
 	"library-button-text": "Gå till hemsidan",
-	"home-button-text": "Gå till huvudsidan för \"{{BOOK_TITLE}}\"",
+	"home-button-text": "Gå till huvudsidan för '{{{BOOK_TITLE}}}'",
 	"random-page-button-text": "Gå till en slumpmässigt utvald sida",
-	"searchbox-tooltip": "Sök efter \"{{BOOK_TITLE}}\"",
+	"searchbox-tooltip": "Sök '{{{BOOK_TITLE}}}'",
 	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat.",
 	"welcome-page-overzealous-filter": "Inga resultat. Vill du <a href=\"{{URL}}\">återställa filtret</a>?",
 	"powered-by-kiwix-html": "Drivs av&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -73,5 +90,6 @@
 	"book-category.wikiversity": "Wikiversity",
 	"book-category.wikivoyage": "Wikivoyage",
 	"book-category.wiktionary": "Wiktionary",
-	"book-category.other": "Övriga"
+	"book-category.other": "Övriga",
+	"text-loading-content": "Laddar innehåll"
 }

static/skin/i18n/tr.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Hedda",
-			"Rofiatmustapha12"
+			"Rofiatmustapha12",
+			"SaldırganSincap"
 		]
 	},
 	"name": "Türkçe",
@@ -23,8 +24,8 @@
 	"404-page-title": "içerik bulunamadı",
 	"404-page-heading": "Bulunamadı",
 	"500-page-title": "İç Sunucu Hatası",
-	"500-page-heading": "İç Sunucu Hatası",
-	"500-page-text": "Dahili bir sunucu hatası oluştu. Bunun için üzgünüz :/",
+	"500-page-heading": "Üzgünüz. Sayfa çalışmıyor.",
+	"500-page-text": "İstenen yol düzgün bir şekilde teslim edilemiyor:",
 	"fulltext-search-unavailable": "Tam metin araması kullanılamıyor",
 	"no-search-results": "Tam metin arama motoru bu içerik için kullanılamaz.",
 	"search-results-page-title": "Arama: {{SEARCH_PATTERN}}",
@@ -33,9 +34,9 @@
 	"search-result-book-info": "{{BOOK_TITLE}} adlı kitaptan",
 	"word-count": "{{COUNT}} kelime",
 	"library-button-text": "Karşılama sayfasına git",
-	"home-button-text": "'{{BOOK_TITLE}}' anasayfasına gidin",
+	"home-button-text": "'{{{BOOK_TITLE}}}' ana sayfasına git",
 	"random-page-button-text": "Rastgele seçilen bir sayfaya git",
-	"searchbox-tooltip": "'{{BOOK_TITLE}}' ara",
+	"searchbox-tooltip": "'{{{BOOK_TITLE}}}' ara",
 	"confusion-of-tongues": "Aramaya farklı dillerde iki veya daha fazla kitap katılacak ve bu da kafa karıştırıcı sonuçlara yol açabilecektir.",
 	"welcome-page-overzealous-filter": "Sonuç yok. <a href=\"{{URL}}\">Filtreyi sıfırlamak</a> ister misiniz?",
 	"powered-by-kiwix-html": "<a href=\"https://kiwix.org\">Kiwix</a> tarafından desteklenmektedir",
@@ -45,16 +46,16 @@
 	"count-of-matching-books": "{{COUNT}} kitap",
 	"download": "İndir",
 	"direct-download-link-text": "Doğrudan",
-	"direct-download-alt-text": "direkt indirme",
-	"hash-download-link-text": "Sha256 haşesi",
-	"hash-download-alt-text": "csv indir",
+	"direct-download-alt-text": "Doğrudan HTTP(S) üzerinden indir",
+	"hash-download-link-text": "SHA-256 sağlama toplamı",
+	"hash-download-alt-text": "SHA-256 dosya toplam kontrolünü görüntüle",
 	"magnet-link-text": "Mıknatıs bağlantısı",
-	"magnet-alt-text": "mıknatısı indir",
-	"torrent-download-link-text": "Hedef dosya",
-	"torrent-download-alt-text": "torrenti indir",
+	"magnet-alt-text": "Mıknatıs bağlantısıyla indir",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "BitTorrent üzerinden indir",
 	"library-opds-feed-all-entries": "Kütüphane OPDS Akışı - Tüm girişler",
-	"filter-by-tag": "\"{{TAG}}\" etiketine göre filtrele",
-	"stop-filtering-by-tag": "\"{{TAG}}\" etiketine göre filtrelemeyi durdur",
+	"filter-by-tag": "\"{{{TAG}}}\" etiketine göre filtrele",
+	"stop-filtering-by-tag": "\"{{{TAG}}}\" etiketine göre filtrelemeyi durdur",
 	"library-opds-feed-parameterised": "Kütüphane OPDS Özet Akışı - {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}} ile eşleşen girişler {{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Kiwix Sunucusuna Hoş Geldiniz",
 	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b> için indirme bağlantıları",

static/skin/i18n/zh-hans.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Cyanjiang",
 			"GuoPC",
 			"IceButBin",
 			"Kichin",
@@ -29,9 +30,25 @@
 	"400-page-heading": "无效请求",
 	"404-page-title": "未找到内容",
 	"404-page-heading": "未找到",
+	"new-404-page-title": "找不到页面",
+	"new-404-page-heading": "哎呀。页面未找到。",
+	"404-img-text": "未找到！",
+	"path-was-not-found": "未找到请求的路径：",
+	"404-advice.p1": "您正在寻找的内容可能仍然可用，但它可能位于 ZIM 文件中的不同位置。",
+	"404-advice.p2": "请：",
+	"404-advice.p3": "尝试使用搜索功能来查找您想要的内容",
+	"404-advice.p4": "查找与你正在寻找的信息相关的关键字或标题",
+	"404-advice.p5": "即使原始链接无法正常工作，这种方法也应该可以帮助您找到所需的内容。",
 	"500-page-title": "内部服务器错误",
-	"500-page-heading": "内部服务器错误",
-	"500-page-text": "内部服务器出现错误。真的十分抱歉 (⁠;⁠ŏ⁠﹏⁠ŏ~⁠)",
+	"500-page-heading": "哎呀。页面无法正常工作。",
+	"500-page-text": "请求的路径无法正确传递：",
+	"500-img-text": "页面无法正常工作",
+	"external-link-detected": "检测到外部链接",
+	"caution-warning": "警告！",
+	"external-link-intro": "你即将离开Kiwix的ZIM阅读器并打开网页",
+	"external-link-advice.p1": "你试图访问的链接不在你的离线包中，需要联网才能访问。",
+	"external-link-advice.p2": "如果您可以上网，您可以尝试打开该链接。",
+	"external-link-advice.p3": "您也可以使用浏览器的后退按钮返回 ZIM 的离线内容。",
 	"fulltext-search-unavailable": "全文搜索不可用",
 	"no-search-results": "全文搜索引擎不适用于该内容。",
 	"search-results-page-title": "搜索：{{SEARCH_PATTERN}}",

static/skin/viewer.js

@@ -83,6 +83,7 @@ function quasiUriEncode(s, specialSymbols) {
 
 function performSearch() {
   const searchbox = document.getElementById('kiwixsearchbox');
+  if (!searchbox.value.trim()) { return;}
   const q = encodeURIComponent(searchbox.value);
   gotoUrl(`/search?books.name=${currentBook}&pattern=${q}&userlang=${viewerState.uiLanguage}`);
 }
@@ -271,10 +272,12 @@ function translateErrorPageIfNeeded() {
 let iframeLocationHref = null;
 
 function handle_content_url_change() {
-  if ( iframeLocationHref == contentIframe.contentWindow.location.href )
+  const iframeLocation = contentIframe.contentWindow.location;
+
+  if ( iframeLocationHref == iframeLocation.href ||
+       !iframeLocation.pathname.startsWith(root + '/content/') )
     return;
 
-  const iframeLocation = contentIframe.contentWindow.location;
   iframeLocationHref = iframeLocation.href;
   console.log('handle_content_url_change: ' + iframeLocation.href);
   document.title = contentIframe.contentDocument.title;
@@ -431,8 +434,6 @@ function setup_chaperon_mode() {
   }
 }
 
-let viewerSetupComplete = false;
-
 function on_content_load() {
   const loader = document.getElementById("kiwix__loader");
 
@@ -588,6 +589,7 @@ function setupViewer() {
 
   const kiwixToolBarWrapper = document.getElementById('kiwixtoolbarwrapper');
   if ( ! viewerSettings.toolbarEnabled ) {
+    finishViewerSetup();
     return;
   }
 
@@ -636,10 +638,13 @@ function updateUIText() {
 function finishViewerSetupOnceTranslationsAreLoaded()
 {
   updateUIText();
+  finishViewerSetup();
+}
+
+function finishViewerSetup()
+{
   handle_location_hash_change();
 
   window.onhashchange = handle_location_hash_change;
   window.onpopstate = handle_history_state_change;
-
-  viewerSetupComplete = true;
 }

static/templates/search_result.html

@@ -117,7 +117,7 @@
               {{title}}
             </a>
             {{#snippet}}
-              <cite>{{>snippet}}...</cite>
+              <cite>{{{snippet}}}...</cite>
             {{/snippet}}
             {{#bookInfo}}
               <div class="book-title">{{{bookInfo}}}</div>

static/templates/search_result.xml

@@ -21,7 +21,7 @@
       <title>{{title}}</title>
       <link>{{absolutePath}}</link>
       {{#snippet}}
-        <description>{{>snippet}}...</description>
+        <description>{{{snippet}}}...</description>
       {{/snippet}}
       {{#bookTitle}}
         <book>

test/server.cpp

@@ -77,7 +77,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=42e90cb9" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=3208c3ed" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=6192cae1" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/fonts/Poppins.ttf?cacheid=af705837" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Roboto.ttf" },
@@ -338,7 +338,7 @@ R"EXPECTEDRESULT(    <link type="text/css" href="./skin/kiwix.css?cacheid=b4e29e
     <script type="text/javascript" src="./skin/polyfills.js?cacheid=a0e0343d"></script>
     <script type="module" src="./skin/i18n.js?cacheid=e9a10ac1" defer></script>
     <script type="text/javascript" src="./skin/languages.js?cacheid=08955948" defer></script>
-    <script type="text/javascript" src="./skin/viewer.js?cacheid=3208c3ed" defer></script>
+    <script type="text/javascript" src="./skin/viewer.js?cacheid=6192cae1" defer></script>
     <script type="text/javascript" src="./skin/autoComplete/autoComplete.min.js?cacheid=1191aaaf"></script>
       const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>

test/server_search.cpp

@@ -689,6 +689,24 @@ bool isSubSnippet(std::string subSnippet, const std::string& superSnippet)
 #define  RAYCHARLESZIMID "6f1d19d0-633f-087b-fb55-7ac324ff9baf"
 #define  EXAMPLEZIMID    "5dc0b3af-5df2-0925-f0ca-d2bf75e78af6"
 
+const std::vector<SearchResult> YELLOW_SEARCH_RESULTS = {
+  SEARCH_RESULT(
+    /*link*/        "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
+    /*title*/       "Eleanor Rigby",
+    /*snippet*/     R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5)SNIPPET" "\xC2\xA0" "August" "\xC2\xA0" "1966" "\xC2\xA0" R"SNIPPET((1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
+    /*bookTitle*/  "Ray Charles",
+    /*wordCount*/  "201"
+  ),
+
+  SEARCH_RESULT(
+    /*link*/        "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
+    /*title*/       "If You Go Away",
+    /*snippet*/     R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
+    /*bookTitle*/  "Ray Charles",
+    /*wordCount*/  "204"
+  )
+};
+
 struct TestData
 {
   struct PaginationEntry
@@ -980,23 +998,7 @@ TEST(ServerSearchTest, searchResults)
       /* resultsPerPage */   0,
       /* totalResultCount */ 2,
       /* firstResultIndex */ 0,
-      /* results */ {
-        SEARCH_RESULT(
-          /*link*/       "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
-          /*title*/      "Eleanor Rigby",
-          /*snippet*/    R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5 August 1966 (1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
-          /*bookTitle*/  "Ray Charles",
-          /*wordCount*/  "201"
-        ),
-
-        SEARCH_RESULT(
-          /*link*/       "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
-          /*title*/      "If You Go Away",
-          /*snippet*/    R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
-          /*bookTitle*/  "Ray Charles",
-          /*wordCount*/  "204"
-        )
-      },
+      /* results */          YELLOW_SEARCH_RESULTS,
       /* pagination */ {}
     },
 
@@ -1006,23 +1008,7 @@ TEST(ServerSearchTest, searchResults)
       /* resultsPerPage */   0,
       /* totalResultCount */ 2,
       /* firstResultIndex */ 0,
-      /* results */ {
-        SEARCH_RESULT(
-          /*link*/       "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
-          /*title*/      "Eleanor Rigby",
-          /*snippet*/    R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5 August 1966 (1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
-          /*bookTitle*/  "Ray Charles",
-          /*wordCount*/  "201"
-        ),
-
-        SEARCH_RESULT(
-          /*link*/       "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
-          /*title*/      "If You Go Away",
-          /*snippet*/    R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
-          /*bookTitle*/  "Ray Charles",
-          /*wordCount*/  "204"
-        )
-      },
+      /* results */         YELLOW_SEARCH_RESULTS,
       /* pagination */ {}
     },
 
@@ -1032,23 +1018,7 @@ TEST(ServerSearchTest, searchResults)
       /* resultsPerPage */   0,
       /* totalResultCount */ 2,
       /* firstResultIndex */ 0,
-      /* results */ {
-        SEARCH_RESULT(
-          /*link*/       "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
-          /*title*/      "Eleanor Rigby",
-          /*snippet*/    R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5 August 1966 (1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
-          /*bookTitle*/  "Ray Charles",
-          /*wordCount*/  "201"
-        ),
-
-        SEARCH_RESULT(
-          /*link*/       "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
-          /*title*/      "If You Go Away",
-          /*snippet*/    R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
-          /*bookTitle*/  "Ray Charles",
-          /*wordCount*/  "204"
-        )
-      },
+      /* results */          YELLOW_SEARCH_RESULTS,
       /* pagination */ {}
     },
 
@@ -1062,6 +1032,16 @@ TEST(ServerSearchTest, searchResults)
       /* pagination */ {}
     },
 
+    {
+      /* query */          "pattern=yellow%20submarine&books.id=" RAYCHARLESZIMID,
+      /* start */            0,
+      /* resultsPerPage */   0,
+      /* totalResultCount */ 1,
+      /* firstResultIndex */ 0,
+      /* results */          { YELLOW_SEARCH_RESULTS[0] },
+      /* pagination */       {}
+    },
+
     {
       /* query */          "pattern=jazz&books.id=" RAYCHARLESZIMID
                            "&userlang=test",