Fixing JS search (#205)

* Bump copyright

* Changes to go track changes in core PR #984

* Get Mathics3 Modules to loading properly ...

This needs the doc-code-rebased-rebased branch of Mathics core.

* improving_guide_handling

* last fixes

* black

* fixes

* black

* windows workflow

* init for DjangoDocGuideSection

* black

* documentation.doc_chapter -> mathics.doc.gather.doc_chapter

* pointing now to master

* mathics-core.master docpipeline compatibility

* black

* increasing python version in workflow

* llvm in osx workflow

* not load modules chapter twice

* cleaning unused libraries. Automatic reload docs when the window is open.

* fix typos found by rocky and codespell.

* redirecting mathics-core branch in workflows

* workflows

* adding comments. More docstrings

* fix search

* restore unchanged files...

* Add guide section to search... (#208)

and other small tweaks

---------

Co-authored-by: rocky <rb@dustyfeet.com>
Co-authored-by: R. Bernstein <rocky@users.noreply.github.com>

Author: mmatera

mathics_django/doc/django_doc.py

@@ -148,6 +148,13 @@ def search_sections(section, result):
                         result.append((True, section))
                         continue
                     search_sections(section, result)
+                for section in chapter.guide_sections:
+                    if matches(section.title):
+                        result.append((section.title == query, section))
+                    elif query == section.operator:
+                        result.append((True, section))
+                        continue
+                    search_sections(section, result)
 
         sorted_results = sorted(result, key=name_compare_goodness)
         return sorted_results

mathics_django/web/controllers/doc.py

@@ -39,15 +39,16 @@ def check_for_new_load_modules():
             MATHICS3_MODULES_SLUG, None
         )
         if mathics3_module_part is None:
-            print("Something is wrong: mathics3_module variable should not be None")
+            print(
+                "Something is wrong: mathics3_module_part variable should not be None"
+            )
 
         # The "Mathics3 modules" part already exists; add the new chapters.
         new_modules = pymathics_modules - seen_pymathics_modules
         for new_module in new_modules:
-            chapter = gather_doc_chapter(
+            gather_doc_chapter(
                 new_module, mathics3_module_part, pymathics_builtins_by_module
             )
-            #  mathics3_module_part.chapters.append(chapter)
         seen_pymathics_modules = copy(pymathics_modules)
     return
 
@@ -65,7 +66,9 @@ def doc(request: WSGIRequest, ajax: bool = False) -> DocResponse:
     )
 
 
-def doc_chapter(request: WSGIRequest, part, chapter, ajax: bool = False) -> DocResponse:
+def doc_chapter(
+    request: WSGIRequest, part: str, chapter: str, ajax: bool = False
+) -> DocResponse:
     """
     Produces HTML via jinja templating for a chapter. Some examples of
     Chapters:
@@ -89,7 +92,7 @@ def doc_chapter(request: WSGIRequest, part, chapter, ajax: bool = False) -> DocR
     )
 
 
-def doc_part(request: WSGIRequest, part, ajax: bool = False) -> DocResponse:
+def doc_part(request: WSGIRequest, part: str, ajax: bool = False) -> DocResponse:
     """
     Produces HTML via jinja templating for a Part - the top-most
     subdivision of the document. Some examples of Parts:

mathics_django/web/media/js/doc.js

@@ -2,7 +2,6 @@ let docLoaded = false, lastSearchValue = '';
 
 function showPage(response) {
 	const doc = document.getElementById('doc');
-
 	if (doc) {
 		doc.innerHTML = response.content;
 	}
@@ -61,7 +60,6 @@ function loadDoc(page) {
 
 function showDoc() {
         const docLink = document.getElementById('doclink');
-        loadDoc('');
 
 	document.getElementById('doc').style.display = 'block';
 
@@ -98,6 +96,7 @@ function toggleDoc() {
 	if (document.getElementById('doc').style.display !== 'none') {
 		hideDoc();
 	} else {
+	        loadDoc("/");
 		showDoc();
 	}