Fix date searches

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

diff --git a/src/phinde/Elasticsearch.php b/src/phinde/Elasticsearch.php
index 6c90480475d152a361ea0eb645dfb842265310a7..5ca2180c8b66a936d731f8e34691af2385a95174 100644 (file)
--- a/src/phinde/Elasticsearch.php
+++ b/src/phinde/Elasticsearch.php
@@ -92,7 +92,7 @@ class Elasticsearch
             $query      = trim(str_replace($matches[0], '', $query));
             $qMust[]    = array(
                 'range' => array(
             $query      = trim(str_replace($matches[0], '', $query));
             $qMust[]    = array(
                 'range' => array(

-                    'modate' => array(
+                    'status.modate' => array(

                         'gt' => $dateAfter . '||/d',
                     )
                 )
                         'gt' => $dateAfter . '||/d',
                     )
                 )


@@ -103,7 +103,7 @@ class Elasticsearch
             $query      = trim(str_replace($matches[0], '', $query));
             $qMust[]    = array(
                 'range' => array(
             $query      = trim(str_replace($matches[0], '', $query));
             $qMust[]    = array(
                 'range' => array(

-                    'modate' => array(
+                    'status.modate' => array(

                         'lt' => $dateBefore . '||/d',
                     )
                 )
                         'lt' => $dateBefore . '||/d',
                     )
                 )


@@ -114,7 +114,7 @@ class Elasticsearch
             $query      = trim(str_replace($matches[0], '', $query));
             $qMust[]    = array(
                 'range' => array(
             $query      = trim(str_replace($matches[0], '', $query));
             $qMust[]    = array(
                 'range' => array(

-                    'modate' => array(
+                    'status.modate' => array(

                         'gte' => $dateExact . '||/d',
                         'lte' => $dateExact . '||/d',
                     )
                         'gte' => $dateExact . '||/d',
                         'lte' => $dateExact . '||/d',
                     )


@@ -135,6 +135,9 @@ class Elasticsearch
             )
         );
 
             )
         );
 

+        if ($sort == '' && $GLOBALS['phinde']['defaultSort'] == 'date') {
+            $sort = 'date';
+        }

         if ($sort == 'date') {
             $sortCfg = array('status.modate' => array('order' => 'desc'));
         } else {
         if ($sort == 'date') {
             $sortCfg = array('status.modate' => array('order' => 'desc'));
         } else {