Minor fixes

Author: Raymond Julin

ElasticSearchClient.php

@@ -82,7 +82,10 @@ public function index($document, $id=false) {
      * @param array $document
      */
     public function search($query) {
-        return $this->transport->search($query);
+        $start = $this->getMicroTime();
+        $result = $this->transport->search($query);
+        $result['time'] = $this->getMicroTime() - $start;
+        return $result;
     }
 
     /**
@@ -105,4 +108,10 @@ public function delete($id=false) {
     public function deleteByQuery($query) {
         return $this->transport->deleteByQuery($query);
     }
+
+    private function getMicroTime() {
+        list($usec, $sec) = explode(" ", microtime());
+        return ((float)$usec + (float)$sec);
+    }
+
 }

lib/builder/ElasticSearchDSLBuilder.php

@@ -32,6 +32,8 @@ class ElasticSearchDSLBuilder {
      * @param array $options
      */
     public function __construct(array $options=array()) {
+        foreach ($options as $key => $value)
+            $this->$key = $value;
     }
 
     /**
@@ -41,7 +43,8 @@ public function __construct(array $options=array()) {
      * @param array $options
      */
     public function query(array $options=array()) {
-        $this->query = new ElasticSearchDSLBuilderQuery($options);
+        if (!($this->query instanceof ElasticSearchDSLBuilderQuery))
+            $this->query = new ElasticSearchDSLBuilderQuery($options);
         return $this->query;
     }
 
@@ -52,6 +55,10 @@ public function query(array $options=array()) {
      */
     public function build() {
         $built = array();
+        if ($this->from != null)
+            $built['from'] = $this->from;
+        if ($this->size != null)
+            $built['size'] = $this->size;
         if (!$this->query)
             throw new Exception("Query must be specified");
         else