Merge "elasticsearch: Add index name to _bulk command path"

htdocs/lib/elastica/README.Mahara

@@ -8,4 +8,6 @@ This library is used for for interfacing with an elasticsearch server.
 
 Changes:
 
- * Removed build & test files not needed for Mahara.
+ * Removed build & test files not needed for Mahara.
\ No newline at end of file
+ * Added an option to do include the Elasticsearch Index in the URL for bulk addDocument calls
+ 
\ No newline at end of file

htdocs/lib/elastica/lib/Elastica/Client.php

@@ -291,15 +291,19 @@ class Client
      * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
      *
      * @param  array|\Elastica\Document[] $docs Array of Elastica\Document
+     * @param  string|\Elastica\Index (Optional) If all of the documents are for the same index
      * @return \Elastica\Bulk\ResponseSet Response object
      */
-    public function addDocuments(array $docs)
+    public function addDocuments(array $docs, Index $index = null)
     {
         if (empty($docs)) {
             throw new InvalidException('Array has to consist of at least one element');
         }
 
         $bulk = new Bulk($this);
+        if ($index) {
+            $bulk->setIndex($index);
+        }
 
         $bulk->addDocuments($docs);
 

htdocs/lib/elastica/lib/Elastica/Index.php

@@ -145,7 +145,7 @@ class Index implements SearchableInterface
             $doc->setIndex($this->getName());
         }
 
-        return $this->getClient()->addDocuments($docs);
+        return $this->getClient()->addDocuments($docs, $this);
     }
 
     /**