Changeset 1578

Timestamp:

Oct 3, 2010, 5:44:01 PM (10 years ago)

Author:

teymour

Message:

résolution du bug solr avec les dates positionnées à minuit

File:

• cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php (modified) (5 diffs)

cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php

@@ -68 +68 @@
     }
     //Récupère les résultats auprès de SolR
-    $params = array('hl'=>'true', 'fl' => 'id,object_id,object_name,date', 'hl.fragsize'=>500, "facet"=>"true", "facet.field"=>array("object_name","tag"), "facet.date" => "date", "facet.date.start"=>"2007-05-01T00:00:00Z", "facet.date.end"=>"NOW", "facet.date.gap"=>"+1MONTH", 'fq' => $fq);
+    $params = array('hl'=>'true', 'fl' => 'id,object_id,object_name,date', 'hl.fragsize'=>500, "facet"=>"true", "facet.field"=>array("object_name","tag"), "facet.date" => "date", "facet.date.start"=>"2007-05-01T00:00:00Z", "facet.date.end"=>"NOW", "facet.date.gap"=>"+1MONTH", 'fq' => $fq, "facet.date.include" => "edge");
     $this->sort_type = 'pertinence';
 
@@ -121 +121 @@
     $this->vue = 'par_mois';
     
+    $period = '';
+
     if ($date) {
       $this->selected['date'][$date] = $date;
@@ -155 +157 @@
       }
       
+      if ($period == 'DAY') {
+        $from = date ('Y-m-d', strtotime($from)-(3600*2+1)).'T23:59:59Z';
+      }
+
       $query .= ' date:['.$from.' TO '.$to.']';
       $params['facet.date.start'] = $from;
@@ -162 +168 @@
     
     $this->start = $params['facet.date.start'];
+    if ($period == 'DAY') {
+      $this->start = date ('Y-m-d', strtotime($this->start)+1).'T00:00:00Z';
+    }
     $this->end = $params['facet.date.end'];
 
@@ -233 +242 @@
     $this->fdates['max'] = 1;
     foreach($results['facet_counts']['facet_dates']['date'] as $date => $nb) {
+      if ($period == 'DAY') {
+        $date = date ('Y-m-d', strtotime($date)+1).'T00:00:00Z';      
+      }
       if (preg_match('/^20/', $date)) {
         $pc = $nb/$results['response']['numFound'];