Merge pull request #1259 from pippotadde/pr_yellow_tests

Testing of a search pattern containing a space

static/skin/i18n/id.json

@@ -1,17 +1,15 @@
 {
 	"@metadata": {
 		"authors": [
-			"Akmaie Ajam",
-			"Bennylin",
-			"Penyuwangi"
+			"Akmaie Ajam"
 		]
 	},
 	"name": "Bahasa Inggris",
 	"suggest-full-text-search": "mengandung '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Tidak ada buku seperti ini: {{BOOK_NAME}}",
-	"too-many-books": "Terlalu banyak buku yang diminta ({{NB_BOOKS}}), batasnya adalah {{LIMIT}}",
+	"too-many-books": "Terlalu banyak buku yang diminta ({{NB_BOOKS}}) dimana batasnya adalah {{LIMIT}}",
 	"no-book-found": "Tidak ada buku yang sesuai kriteria yang dipilih",
-	"url-not-found": "URL yang diminta \"{{url}}\" tidak ditemukan di peladen ini.",
+	"url-not-found": "URL yang diminta \"{{url}}\" tidak ditemukan di server ini.",
 	"suggest-search": "Lakukan pencarian teks lengkap untuk <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Waduh! Gagal memilih artikel acak :(",
 	"invalid-raw-data-type": "{{DATATYPE}} bukan permintaan yang sah untuk konten mentah.",
@@ -23,9 +21,9 @@
 	"400-page-heading": "Permintaan tidak sah",
 	"404-page-title": "Konten tidak ditemukan",
 	"404-page-heading": "Tidak Ditemukan",
-	"500-page-title": "Galat Peladen Internal",
-	"500-page-heading": "Aduh. Halaman tidak bekerja.",
-	"500-page-text": "Jalur yang diminta tidak dapat diantar dengan benar:",
+	"500-page-title": "Kesalahan Server Internal",
+	"500-page-heading": "Kesalahan Server Internal",
+	"500-page-text": "Terjadi kesalahan server internal. Kami mohon maaf atas hal ini :/",
 	"fulltext-search-unavailable": "Pencarian teks lengkap tidak tersedia",
 	"no-search-results": "Mesin pencari teks lengkap tidak tersedia untuk konten ini.",
 	"search-results-page-title": "Pencarian: {{SEARCH_PATTERN}}",
@@ -57,7 +55,7 @@
 	"filter-by-tag": "Saring berdasarkan tag \"{{{TAG}}}\"",
 	"stop-filtering-by-tag": "Berhenti penyaringan berdasarkan tag \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Umpan OPDS Perpustakaan - entri yang cocok dengan {{#LANG}}\nBahasa: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nKueri: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Selamat datang di Peladen Kiwix",
+	"welcome-to-kiwix-server": "Selamat datang di Server Kiwix",
 	"download-links-heading": "Tautan unduhan untuk <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Unduh buku",
 	"preview-book": "Pratayang",

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}`);
 }

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=00e0fdf3" },
+  { 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=00e0fdf3" 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",