fixing highlighting

Author: safwanrahman

readthedocs/search/views.py

@@ -49,9 +49,8 @@ def elastic_search(request):
         if user_input.type == 'project':
             project_search = ProjectDocument.faceted_search(query=user_input.query,
                                                             language=user_input.language)
-            response = project_search.execute()
-            results = response.hits
-            facets = response.facets
+            results = project_search.execute()
+            facets = results.facets
         elif user_input.type == 'file':
             kwargs = {}
             if user_input.project:
@@ -66,9 +65,8 @@ def elastic_search(request):
                 kwargs['versions_list'] = user_input.version
 
             page_search = PageDocument.faceted_search(query=user_input.query, **kwargs)
-            response = page_search.execute()
-            results = response.hits
-            facets = response.facets
+            results = page_search.execute()
+            facets = results.facets
 
     if settings.DEBUG:
         print(pprint(results))
@@ -91,7 +89,7 @@ def elastic_search(request):
     template_vars = user_input._asdict()
     template_vars.update({
         'results': results,
-        'facets': facets,
+        'facets': facets
     })
     return render(
         request,

readthedocs/templates/search/elastic_search.html

@@ -129,7 +129,8 @@ <h3>{% blocktrans with query=query|default:"" %}Results for {{ query }}{% endblo
 
                               {# Project #}
                               <a href="{{ result.url }}">{{ result.name }}</a>
-                              {% for fragment in result.description|slice:":3" %}
+                                {{ result.meta.description }}
+                              {% for fragment in result.meta.highlight.description|slice:":3" %}
                                 <p>
                                 ...{{ fragment|safe }}...
                                 </p>
@@ -141,7 +142,7 @@ <h3>{% blocktrans with query=query|default:"" %}Results for {{ query }}{% endblo
 
                               {# File #}
                               <a href="{% doc_url result.project|get_project result.version result.path %}?highlight={{ query }}">{{ result.project }} - {{ result.title|safe }}</a>
-                              {% for fragment in result.highlight.content|slice:":3" %}
+                              {% for fragment in result.meta.highlight.content|slice:":3" %}
                                 <p>
                                 ...{{ fragment|safe }}...
                                 </p>