Fix some issues that caused spellcheck not to work.

Author: kernelmethod

src/search/views/search_results.py

@@ -20,11 +20,11 @@ class SearchView(BasicSearchMixin, View):
     default_pagination = 10
 
     def get(self, request):
-        query = request.GET.dict()
-        query.setdefault("query", "")
+        req = request.GET.dict()
+        query = req.setdefault("query", "")
         self.search_logger.info(f"QUERY = {query}")
-        results = self.execute_basic_search(query)
-        search_form = self.create_search_form(query)
+        results = self.execute_basic_search(req)
+        search_form = self.create_search_form(req)
 
         # Populate some CompendiumEntry objects with the data that we found
         # from Solr
@@ -33,11 +33,6 @@ def get(self, request):
 
         hits = results["response"]["numFound"]
         rows = results["meta"]["rows"]  # Entries per page
-        page = results["meta"]["page"]
-
-        # Start/end result numbers
-        start = min(results["response"]["start"] + 1, hits)
-        end = results["response"]["start"] + len(entries)
 
         if hits == 0:
             n_pages = 0
@@ -49,14 +44,13 @@ def get(self, request):
             "search_form": search_form,
             "qtime": results["responseHeader"]["QTime"],
             "hits": hits,
-            "page": page,
+            "page": results["meta"]["page"],
             "n_pages": n_pages,
             "rows": rows,
-            "start": start,
-            "end": end,
+            # Start/end result numbers
+            "start": results["response"]["start"] + 1,
+            "end": results["response"]["start"] + len(entries),
             "entries": entries,
-            "start": start,
-            "rows": rows,
         }
 
         # Check spelling
@@ -89,8 +83,6 @@ def _check_spelling(self, query: str, results: dict):
             if no suggested query could be generated.
         """
 
-        self.search_logger.info(results)
-
         hits = results["response"]["numFound"]
         correctly_spelled = results.get("spellcheck", {}).get("correctlySpelled", True)
         correctly_spelled = correctly_spelled or hits > 10

src/utils/test_utils.py

@@ -70,7 +70,7 @@ def setUp(self, seed=0, create_user=False, preauth=False):
     def fail(self, *args, **kwargs):
         pass
 
-    def wait_for(self, test, max_wait=5, interval=0.1):
+    def wait_for(self, test, max_wait=10, interval=0.25):
         """
         Wait for a test to pass. When it passes we can continue execution. If the
         wait exceeds the time limit, then we throw an error.