Changeset 1580

Timestamp:

Oct 3, 2010, 6:25:54 PM (10 years ago)

Author:

teymour

Message:

Url lisible pour la recherche des dates

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/solr/actions/actions.class.php (modified) (3 diffs)
• apps/frontend/modules/solr/templates/searchSuccess.php (modified) (3 diffs)
• lib/model/doctrine/myTools.class.php (modified) (4 diffs)

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

@@ -73 +73 @@
     $this->sort = $request->getParameter('sort');
     $date = $request->getParameter('date');
-    $from = $request->getParameter('from');
     $format = $request->getParameter('format');
 
@@ -125 +124 @@
     if ($date) {
       $this->selected['date'][$date] = $date;
+      if (preg_match('/\d{8}/',$date)) {
+        $date = preg_replace('/(\d{4})(\d{2})(\d{2})/', '\1-\2-\3T00:00:00Z', $date);
+      }
       $dates = explode(',', $date);
       list($from, $to) = $dates;
@@ -243 +245 @@
     foreach($results['facet_counts']['facet_dates']['date'] as $date => $nb) {
       if ($period == 'DAY') {
-        $date = date ('Y-m-d', strtotime($date)+1).'T00:00:00Z';      
+        $date = date ('Ymd', strtotime($date)+1);
+      }else{
+        $date = date ('Ymd', strtotime($date));
       }
       if (preg_match('/^20/', $date)) {

cpc/trunk/project/apps/frontend/modules/solr/templates/searchSuccess.php

@@ -22 +22 @@
 
 function addToDate($date, $interval) {
-  $date = explode("T", $date); 
-  $date = explode("-", $date[0]);
+  $date = preg_replace('/\-/', '', $date);
+  $annee = substr($date, 0, 4);
+  $mois = substr($date, 4, 2);
+  $jour = substr($date, 6, 2);
   if($interval == 'mois') {
-    $date = mktime(0, 0, 0, $date[1] + 1, $date[2], $date[0]); 
+    $date = mktime(0, 0, 0, $mois + 1, $jour, $annee); 
     #int mktime  ("H","m","s","M","j","Y", -1)
   }
-  else { $date = mktime(0, 0, 0, $date[1], $date[2] - 1, $date[0]); }
-  $date = date("Y-m-d", $date).'T00%3A00%3A00Z';
+  else { $date = mktime(0, 0, 0, $mois, $jour - 1, $annee); }
+  $date = date("Ymd", $date);
   return $date;
 }
@@ -124 +126 @@
 </div>
 <?php 
-$start = explode("T", $start);
-if($end == 'NOW') { $end = date("Y-m-d").'T00%3A00%3A00Z'; }
-$end =  explode("T", $end);
+  if($end == 'NOW') { $end = date("Ymd");; }
 ?>
 <h1><?php
 switch ($vue) {
   case "jour":
-    $periode_text = 'le '.myTools::displayShortDate($start[0]);
+    $periode_text = 'le '.myTools::displayShortDate($start);
     echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text;
     $graph = 0;
     break;
   case "mois":
-    $periode_text = 'en '.myTools::displayMoisAnnee($start[0]);
+    $periode_text = 'en '.myTools::displayMoisAnnee($start);
     echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text;
     $graph = 1;
     break;
   case "par_jour":
-    $periode_text = 'entre le '.myTools::displayShortDate($start[0]).' et le '.myTools::displayShortDate($end[0]);
+    $periode_text = 'entre le '.myTools::displayShortDate($start).' et le '.myTools::displayShortDate($end);
     echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text;
     $graph = 1;
     break;
   case "par_mois":
-    $periode_text = 'entre '.myTools::displayMoisAnnee($start[0]).' et '.myTools::displayMoisAnnee($end[0]);
+    $periode_text = 'entre '.myTools::displayMoisAnnee($start).' et '.myTools::displayMoisAnnee($end);
     echo 'Résultats pour "<em>'.$recherche.'</em>" '.$periode_text;
     $graph = 1;
@@ -175 +175 @@
     $newargs = $selected;
     
-    $title_date = explode("T", $date);
-    
     $newargs['date'] = $date.'%2C'.$date;
     
     if(($vue == 'jour') or ($vue == 'par_jour') or ($vue == 'mois')){ 
-      $title_date = myTools::displayShortDate($title_date[0]).' : '.$nb['nb'].' résultats';
+      $title_date = myTools::displayShortDate($date).' : '.$nb['nb'].' résultats';
     }
     if($vue == 'par_mois') { 
-      $title_date = ucfirst(myTools::displayMoisAnnee($title_date[0])).' : '.$nb['nb'].' résultats';
+      $title_date = ucfirst(myTools::displayMoisAnnee($date)).' : '.$nb['nb'].' résultats';
     }
     if($vue == 'par_mois') { 

cpc/trunk/project/lib/model/doctrine/myTools.class.php

@@ -45 +45 @@
 
   public static function displayShortDate($d) {
-    $date = substr($d,8,2)."/";        // jour
-    $date = $date.substr($d,5,2)."/";  // mois
+    $d = preg_replace ('/\-/', '', $d);
+    $date = substr($d,6,2)."/";        // jour
+    $date = $date.substr($d,4,2)."/";  // mois
     $date = $date.substr($d,0,4);      // année
     return $date;
@@ -52 +53 @@
 
   public static function displayVeryShortDate($d) {
-    $date = substr($d,8,2)."/";        // jour
-    $date = $date.substr($d,5,2)."/";  // mois
+    $d = preg_replace ('/\-/', '', $d);
+    $date = substr($d,6,2)."/";        // jour
+    $date = $date.substr($d,4,2)."/";  // mois
     $date = $date.substr($d,2,2);      // année
     return $date;
@@ -59 +61 @@
   
   public static function displayMoisAnnee($d) {
-    $date = self::$num_mois[substr($d,5,2)].' ';  // mois txt
+    $d = preg_replace ('/\-/', '', $d);
+    $date = self::$num_mois[substr($d,4,2)].' ';  // mois txt
     $date = $date.substr($d,0,4);      // année num
     return $date;
@@ -65 +68 @@
  
   public static function displayDateTime($d) { 
+    $d = preg_replace ('/\-/', '', $d);
     $date = self::displayShortDate($d)." à "; 
     $date = $date.substr($d,11,5);     // heures et minutes