Fix queryset highlighting so it actually works

parasolr/query/queryset.py

@@ -92,7 +92,7 @@ def _set_highlighting_opts(self, query_opts: Dict) -> None:
         if self.highlight_field:
             query_opts.update({
                 'hl': True,
-                'hl.field': self.highlight_field
+                'hl.fl': self.highlight_field
             })
             for key, val in self.highlight_opts.items():
                 query_opts['hl.%s' % key] = val
@@ -519,7 +519,7 @@ def get_highlighting(self):
         """Return the highlighting portion of the Solr response."""
         if not self._result_cache:
             self.get_results()
-        return self._result_cache.get('highlighting', {})
+        return self._result_cache.highlighting
 
     def all(self) -> 'SolrQuerySet':
         """Return a new queryset that is a copy of the current one."""

parasolr/query/tests/test_queryset.py

@@ -26,7 +26,7 @@ def test_query_opts(self):
         assert query_opts['q'] == '*:*'
         # don't include unset options
         for opt in ['fq', 'rows', 'sort', 'fl', 'hl',
-                    'hl.field', 'facet', 'stats', 'stats.field']:
+                    'hl.fl', 'facet', 'stats', 'stats.field']:
             assert opt not in query_opts
 
         # customized query opts
@@ -53,7 +53,7 @@ def test_query_opts(self):
         assert query_opts['fl'] == ','.join(sqs.field_list)
         # highlighting should be turned on
         assert query_opts['hl']
-        assert query_opts['hl.field'] == 'content'
+        assert query_opts['hl.fl'] == 'content'
         # highlighting options added with hl.prefix
         assert query_opts['hl.snippets'] == 3
         assert query_opts['hl.method'] == 'unified'
@@ -496,12 +496,17 @@ def test_get_highlighting(self):
         mocksolr = Mock(spec=SolrClient)
         sqs = SolrQuerySet(mocksolr)
         # simulate result cache already populated, no highlighting
-        sqs._result_cache = {'response': {'docs': []}}
+        sqs._result_cache = QueryResponse({
+            'responseHeader': {'params': ''},
+            'response': {
+                'docs': [], 'numFound': 0, 'start': 1,
+            }
+        })
         assert sqs.get_highlighting() == {}
 
         # simulate response with highlighting
         mock_highlights = {'id1': {'text': ['sample match content']}}
-        sqs._result_cache = {'highlighting': mock_highlights}
+        sqs._result_cache = Mock(highlighting=mock_highlights)
         assert sqs.get_highlighting() == mock_highlights
 
         # should populate cache if empty

parasolr/solr/client.py

@@ -60,6 +60,8 @@ def __init__(self, response: Dict) -> None:
         if 'facet_counts' in response:
             self.facet_counts = \
                 self._process_facet_counts(response.facet_counts)
+        self.highlighting = response.get('highlighting', {})
+
         # NOTE: To access facet_counts.facet_fields or facet_counts.facet_ranges
         # as OrderedDicts, you must use dict notation (or AttrDict *will*
         # convert).

parasolr/solr/tests/test_client.py

@@ -1,12 +1,12 @@
-from collections import OrderedDict
 import time
+from collections import OrderedDict
 
 from attrdict import AttrDict
 import requests
 
 from parasolr import __version__ as parasolr_ver
 from parasolr.solr.admin import CoreAdmin
-from parasolr.solr.client import QueryResponse, SolrClient, ParasolrDict
+from parasolr.solr.client import ParasolrDict, QueryResponse, SolrClient
 from parasolr.solr.schema import Schema
 from parasolr.solr.update import Update
 
@@ -93,6 +93,7 @@ def test_init(self):
                           OrderedDict)
         assert qr.facet_counts['facet_fields']['A']['5'] == 1
         assert qr.facet_counts['facet_ranges']['A']['counts']['2'] == 2
+        assert qr.highlighting == {}
 
 
 class TestSolrClient: