Merge pull request #580 from MrHash/master

Options for TermsFilter lookup

Author: ruflin

changes.txt

@@ -1,5 +1,8 @@
 CHANGES
 
+2014-04-7
+- Support for Terms filter lookup options
+
 2014-03-29
 - Update to elasticsearch 1.1.0
 

lib/Elastica/Filter/Terms.php

@@ -67,10 +67,10 @@ public function setTerms($key, array $terms)
      * @param string|\Elastica\Type $type document type from which to fetch the terms values
      * @param string $id id of the document from which to fetch the terms values
      * @param string $path the field from which to fetch the values for the filter
-     * @param string|\Elastica\Index $index the index from which to fetch the terms values. Defaults to the current index.
+     * @param string|array|\Elastica\Index $options An array of options or the index from which to fetch the terms values. Defaults to the current index.
      * @return \Elastica\Filter\Terms Filter object
      */
-    public function setLookup($key, $type, $id, $path, $index = NULL)
+    public function setLookup($key, $type, $id, $path, $options = array())
     {
         $this->_key = $key;
         if ($type instanceof \Elastica\Type) {
@@ -81,6 +81,16 @@ public function setLookup($key, $type, $id, $path, $index = NULL)
             'id' => $id,
             'path' => $path
         );
+        
+        $index = $options;
+        if(is_array($options)) {
+            if(isset($options['index'])) {
+                $index = $options['index'];
+                unset($options['index']);
+            }
+            $this->_terms = array_merge($options, $this->_terms);
+        }
+        
         if (!is_null($index)) {
             if ($index instanceof \Elastica\Index) {
                 $index = $index->getName();

test/lib/Elastica/Test/Filter/TermsTest.php

@@ -26,12 +26,29 @@ public function testLookup()
 
         //use the terms lookup feature to query for some data
         $termsFilter = new Terms();
-        $termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members');
+        $termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', NULL);
         $query = new \Elastica\Query();
         $query->setFilter($termsFilter);
         $results = $index->search($query);
-
-        $this->assertEquals($results->count(), 4);
+        $this->assertEquals($results->count(), 4, 'Terms lookup with null index');
+        
+        $termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', $index);
+        $query->setFilter($termsFilter);
+        $results = $index->search($query);
+        $this->assertEquals($results->count(), 4, 'Terms lookup with index as object');
+        
+        //Query with index given as string
+        $termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', $index->getName());
+        $query->setFilter($termsFilter);
+        $results = $index->search($query);
+        $this->assertEquals($results->count(), 4, 'Terms lookup with index as string');
+        
+        //Query with array of options
+        $termsFilter->setLookup('lastName', $type2, 'led zeppelin', 'members', array('index' => $index, 'cache' => false));
+        $query->setFilter($termsFilter);
+        $results = $index->search($query);
+        $this->assertEquals($results->count(), 4, 'Terms lookup with options array');
+        
         $index->delete();
     }
 }