From fc68a9e6d80d2775c5dea254a16a6c23dec30860 Mon Sep 17 00:00:00 2001
From: Sergei Izmailov <sergei.a.izmailov@gmail.com>
Date: Sat, 27 Jun 2020 20:58:03 +0300
Subject: [PATCH] Fix searchdata.bin download url in nested pages

---
 documentation/templates/python/base.html                      | 2 +-
 documentation/test_python/page_nested/classes.html            | 4 +++-
 .../test_python/page_nested/examples/advanced/barz.html       | 4 +++-
 .../test_python/page_nested/examples/advanced/fooz.html       | 4 +++-
 .../test_python/page_nested/examples/advanced/index.html      | 4 +++-
 documentation/test_python/page_nested/examples/bar.html       | 4 +++-
 documentation/test_python/page_nested/examples/foo.html       | 4 +++-
 documentation/test_python/page_nested/examples/index.html     | 4 +++-
 documentation/test_python/page_nested/index.html              | 4 +++-
 documentation/test_python/page_nested/modules.html            | 4 +++-
 documentation/test_python/page_nested/pages.html              | 4 +++-
 documentation/test_python/test_page.py                        | 1 +
 12 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/documentation/templates/python/base.html b/documentation/templates/python/base.html
index 20c3cb19..60db580a 100644
--- a/documentation/templates/python/base.html
+++ b/documentation/templates/python/base.html
@@ -135,7 +135,7 @@
 {% endif %}
 {% if SEARCH_DOWNLOAD_BINARY %}
 <script>
-  Search.download({% if SEARCH_DOWNLOAD_BINARY is string %}'{{ SEARCH_DOWNLOAD_BINARY.format(SEARCHDATA_FORMAT_VERSION)|format_url|e }}'{% else %}window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1) + 'searchdata-v{{ SEARCHDATA_FORMAT_VERSION }}.bin'{% endif %});
+  Search.download({% if SEARCH_DOWNLOAD_BINARY is string %}'{{ SEARCH_DOWNLOAD_BINARY.format(SEARCHDATA_FORMAT_VERSION)|format_url|e }}'{% else %}window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1){% if site_root %} + '{{site_root}}' {% endif %} + 'searchdata-v{{ SEARCHDATA_FORMAT_VERSION }}.bin'{% endif %});
 </script>
 {% else %}
 <script src="{{ 'searchdata-v{}.js'.format(SEARCHDATA_FORMAT_VERSION)|format_url|e }}" async="async"></script>
diff --git a/documentation/test_python/page_nested/classes.html b/documentation/test_python/page_nested/classes.html
index eb0c2410..17aeb898 100644
--- a/documentation/test_python/page_nested/classes.html
+++ b/documentation/test_python/page_nested/classes.html
@@ -94,6 +94,8 @@ <h1>Classes</h2>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/advanced/barz.html b/documentation/test_python/page_nested/examples/advanced/barz.html
index 4e9f8334..a6838aa9 100644
--- a/documentation/test_python/page_nested/examples/advanced/barz.html
+++ b/documentation/test_python/page_nested/examples/advanced/barz.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../../search-v1.js"></script>
 <script> Search.siteRoot = "../../"; </script>
-<script src="../../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/advanced/fooz.html b/documentation/test_python/page_nested/examples/advanced/fooz.html
index fbe93559..616a6345 100644
--- a/documentation/test_python/page_nested/examples/advanced/fooz.html
+++ b/documentation/test_python/page_nested/examples/advanced/fooz.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../../search-v1.js"></script>
 <script> Search.siteRoot = "../../"; </script>
-<script src="../../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/advanced/index.html b/documentation/test_python/page_nested/examples/advanced/index.html
index b421eeef..96fceadb 100644
--- a/documentation/test_python/page_nested/examples/advanced/index.html
+++ b/documentation/test_python/page_nested/examples/advanced/index.html
@@ -84,6 +84,8 @@ <h1>
 </div>
 <script src="../../search-v1.js"></script>
 <script> Search.siteRoot = "../../"; </script>
-<script src="../../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/bar.html b/documentation/test_python/page_nested/examples/bar.html
index c0274816..6a0a1700 100644
--- a/documentation/test_python/page_nested/examples/bar.html
+++ b/documentation/test_python/page_nested/examples/bar.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../search-v1.js"></script>
 <script> Search.siteRoot = "../"; </script>
-<script src="../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/foo.html b/documentation/test_python/page_nested/examples/foo.html
index c6d9e7ef..5068e17a 100644
--- a/documentation/test_python/page_nested/examples/foo.html
+++ b/documentation/test_python/page_nested/examples/foo.html
@@ -80,6 +80,8 @@ <h1>
 </div>
 <script src="../search-v1.js"></script>
 <script> Search.siteRoot = "../"; </script>
-<script src="../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/examples/index.html b/documentation/test_python/page_nested/examples/index.html
index 8294fe1d..5ec6d5e5 100644
--- a/documentation/test_python/page_nested/examples/index.html
+++ b/documentation/test_python/page_nested/examples/index.html
@@ -90,6 +90,8 @@ <h2>Advanced</h2>
 </div>
 <script src="../search-v1.js"></script>
 <script> Search.siteRoot = "../"; </script>
-<script src="../searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + '../'  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/index.html b/documentation/test_python/page_nested/index.html
index f25dc1c8..acd13d4d 100644
--- a/documentation/test_python/page_nested/index.html
+++ b/documentation/test_python/page_nested/index.html
@@ -80,6 +80,8 @@ <h1>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/modules.html b/documentation/test_python/page_nested/modules.html
index e2e76b05..34d85a4c 100644
--- a/documentation/test_python/page_nested/modules.html
+++ b/documentation/test_python/page_nested/modules.html
@@ -94,6 +94,8 @@ <h1>Modules</h2>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/page_nested/pages.html b/documentation/test_python/page_nested/pages.html
index 78b92119..979a2bd9 100644
--- a/documentation/test_python/page_nested/pages.html
+++ b/documentation/test_python/page_nested/pages.html
@@ -100,6 +100,8 @@ <h1>Pages</h2>
   </div>
 </div>
 <script src="search-v1.js"></script>
-<script src="searchdata-v1.js" async="async"></script>
+<script>
+  Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1)  + 'searchdata-v1.bin');
+</script>
 </body>
 </html>
diff --git a/documentation/test_python/test_page.py b/documentation/test_python/test_page.py
index 3dedd37d..4ae58465 100644
--- a/documentation/test_python/test_page.py
+++ b/documentation/test_python/test_page.py
@@ -58,6 +58,7 @@ def test(self):
                 'examples/advanced/barz.rst',
             ],
             'SEARCH_DISABLED': False,
+            'SEARCH_DOWNLOAD_BINARY': True,
             'PLUGINS': [
                 'm.sphinx'
             ]