add date sorting

[phinde.git] / src / phinde / Elasticsearch.php

diff --git a/src/phinde/Elasticsearch.php b/src/phinde/Elasticsearch.php
index 5ad46e74030e9d8c2c27cc05083a547fe493837d..310b63bd1538009083e5287cfd0a23dd0f99c5ad 100644 (file)
--- a/src/phinde/Elasticsearch.php
+++ b/src/phinde/Elasticsearch.php
@@ -68,8 +68,14 @@ class Elasticsearch
         $r->send();
     }
 
-    public function search($query, $filters, $site, $page, $perPage)
+    public function search($query, $filters, $site, $page, $perPage, $sort)
     {
+        if ($sort == 'date') {
+            $sortCfg = array('modate' => array('order' => 'desc'));
+        } else {
+            $sortCfg = array();
+        }
+
         $r = new Elasticsearch_Request(
             $this->baseUrl . 'document/_search',
             \HTTP_Request2::METHOD_GET
@@ -87,6 +93,7 @@ class Elasticsearch
                         array(
                             'query_string' => array(
                                 'default_field' => '_all',
+                                'default_operator' => 'AND',
                                 'query' => $query
                             )
                         ),
@@ -141,9 +148,7 @@ class Elasticsearch
             ),
             'from' => $page * $perPage,
             'size' => $perPage,
-            'sort' => array(
-                //array('modate' => array('order' => 'desc'))
-            )
+            'sort' => $sortCfg,
         );
         foreach ($filters as $type => $value) {
             $doc['query']['bool']['must'][] = array(