Merge branch 'develop' of github.com:basdenooijer/solarium into develop

basdenooijer · Nov 4, 2014 · df971be · df971be
2 parents 2015a57 + 2acf137
commit df971be
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/library/Solarium/QueryType/Extract/Query.php b/library/Solarium/QueryType/Extract/Query.php
@@ -72,6 +72,7 @@ class Query extends BaseQuery
         'resultclass' => 'Solarium\QueryType\Extract\Result',
         'documentclass' => 'Solarium\QueryType\Update\Query\Document\Document',
         'omitheader'  => true,
+        'extractonly' => false,
     );
 
     /**
@@ -387,6 +388,25 @@ public function getDocumentClass()
         return $this->getOption('documentclass');
     }
 
+    /**
+     * Set the ExtractOnly parameter of SOLR Extraction Handler
+     *
+     * @param bool $value
+     * @return self Provides fluent interface
+     */
+    public function setExtractOnly($value) {
+        return $this->setOption('extractonly', (bool) $value);
+    }
+
+    /**
+     * Get the ExtractOnly parameter of SOLR Extraction Handler
+     *
+     * @return boolean
+     */
+    public function getExtractOnly() {
+        return $this->getOption('extractonly');
+    }
+
     /**
      * Create a document object instance
      *

diff --git a/library/Solarium/QueryType/Extract/RequestBuilder.php b/library/Solarium/QueryType/Extract/RequestBuilder.php
@@ -75,6 +75,7 @@ public function build(QueryInterface $query)
         $request->addParam('uprefix', $query->getUprefix());
         $request->addParam('lowernames', $query->getLowernames());
         $request->addParam('defaultField', $query->getDefaultField());
+        $request->addParam('extractOnly', $query->getExtractOnly());
 
         foreach ($query->getFieldMappings() as $fromField => $toField) {
             $request->addParam('fmap.' . $fromField, $toField);

diff --git a/tests/Solarium/Tests/QueryType/Extract/QueryTest.php b/tests/Solarium/Tests/QueryType/Extract/QueryTest.php
@@ -106,6 +106,12 @@ public function testSetAndGetDefaultField()
         $this->assertEquals('defaulttext', $this->query->getDefaultField());
     }
 
+    public function testSetAndGetExtractOnly()
+    {
+        $this->query->setExtractOnly(true);
+        $this->assertEquals(true, $this->query->getExtractOnly());
+    }
+
     public function testSetAndGetLowernames()
     {
         $this->query->setLowernames(true);

diff --git a/tests/Solarium/Tests/QueryType/Extract/RequestBuilderTest.php b/tests/Solarium/Tests/QueryType/Extract/RequestBuilderTest.php
@@ -78,7 +78,7 @@ public function testGetUri()
     {
         $request = $this->builder->build($this->query);
         $this->assertEquals(
-            'update/extract?omitHeader=true&param1=value1&wt=json&json.nl=flat&fmap.from-field=to-field'.
+            'update/extract?omitHeader=true&param1=value1&wt=json&json.nl=flat&extractOnly=false&fmap.from-field=to-field'.
             '&resource.name=RequestBuilderTest.php',
             $request->getUri()
         );
@@ -90,7 +90,7 @@ public function testGetUriWithStreamUrl()
         $query->setFile('http://solarium-project.org/');
         $request = $this->builder->build($query);
         $this->assertEquals(
-            'update/extract?omitHeader=true&param1=value1&wt=json&json.nl=flat&fmap.from-field=to-field'.
+            'update/extract?omitHeader=true&param1=value1&wt=json&json.nl=flat&extractOnly=false&fmap.from-field=to-field'.
             '&stream.url=http%3A%2F%2Fsolarium-project.org%2F',
             $request->getUri()
         );
@@ -112,6 +112,7 @@ public function testDocumentFieldAndBoostParams()
                 'literal.field1' => 'value1',
                 'literal.field2' => 'value2',
                 'omitHeader' => 'true',
+                'extractOnly' => 'false',
                 'param1' => 'value1',
                 'resource.name' => 'RequestBuilderTest.php',
                 'wt' => 'json',