Enable setting up highlighting for multiple fields at once

Thanks robhudson!
elastic · Jan 23, 2015 · 59b2662 · 59b2662
1 parent fd8ff11
commit 59b2662
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/elasticsearch_dsl/search.py b/elasticsearch_dsl/search.py
@@ -262,17 +262,28 @@ def highlight_options(self, **kwargs):
         s._highlight_opts.update(kwargs)
         return s
 
-    def highlight(self, field, **kwargs):
+    def highlight(self, *fields, **kwargs):
         """
-        Request highliting of a field. All keyword arguments passed in will be
+        Request highliting of some fields. All keyword arguments passed in will be
         used as parameters. Example::
 
-            Search().highlight('title', fragment_size=50)
+            Search().highlight('title', 'body', fragment_size=50)
+
+        will produce the equivalent of::
+
+            {
+                "highlight": {
+                    "fields": {
+                        "body": {"fragment_size": 50},
+                        "title": {"fragment_size": 50}
+                    }
+                }
+            }
 
-        :arg field: name of the field to be highlighted
         """
         s = self._clone()
-        s._highlight[field] = kwargs
+        for f in fields:
+            s._highlight[f] = kwargs
         return s
 
     def index(self, *index):

diff --git a/test_elasticsearch_dsl/test_search.py b/test_elasticsearch_dsl/test_search.py
@@ -163,7 +163,7 @@ def test_complex_example():
 
     s.query.minimum_should_match = 2
 
-    s = s.highlight_options(order='score').highlight('title', fragment_size=50)
+    s = s.highlight_options(order='score').highlight('title', 'body', fragment_size=50)
 
     assert {
         'query': {
@@ -199,7 +199,8 @@ def test_complex_example():
         "highlight": {
             'order': 'score',
             'fields': {
-                'title': {'fragment_size': 50}
+                'title': {'fragment_size': 50},
+                'body': {'fragment_size': 50}
             }
         }
     } == s.to_dict()