Merge branch 'master' of https://github.com/aguereca/pyes

aguereca · Apr 1, 2011 · b123814 · b123814
2 parents 70766e9 + 03f720b
commit b123814
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pyes/facets.py b/pyes/facets.py
@@ -167,7 +167,7 @@ def serialize(self):
 class TermFacet(Facet):
     _internal_name = "terms"
 
-    def __init__(self, field, name=None, size=10,
+    def __init__(self, field=None, fields=None, name=None, size=10,
                  order=None, exclude=None,
                  regex=None, regex_flags="DOTALL",
                  script=None, **kwargs):
@@ -184,7 +184,14 @@ def __init__(self, field, name=None, size=10,
         self.script = script
 
     def serialize(self):
-        data = {'field':self.field}
+        if self.fields:
+            data = {'fields':self.fields}
+        else:
+            if self.field:
+                data = {'field':self.field}
+            else:
+                raise RuntimeError("Field or Fields is required:%s" % self.order)
+
         if self.size:
             data['size'] = self.size
 

diff --git a/pyes/query.py b/pyes/query.py
@@ -798,7 +798,7 @@ def __init__(self, field=None, value=None, boost=None, **kwargs):
         self._values = {}
 
         if field is not None and value is not None:
-            self.add(field, value)
+            self.add(field, value, boost)
 
     def add(self, field, value, boost=None):
         if not value.strip():