Changeset 1634

Timestamp:

Oct 4, 2010, 3:01:35 AM (10 years ago)

Author:

teymour

Message:

Des RSS pour les objects + description

Location:

cpc/trunk/project/apps/frontend

Files:

• config/routing.yml (modified) (3 diffs)
• modules/solr/actions/actions.class.php (modified) (2 diffs)

cpc/trunk/project/apps/frontend/config/routing.yml

@@ -446 +446 @@
 parlementaire_amendements_rss:
   url: /:slug/amendements/rss
-  param: {module: parlementaire, action: rss, object_type: Amendement, title: "Tous les amendements signés par %"}
+  param: {module: parlementaire, action: rss, object_name: Amendement, title: "Tous les amendements signés par %"}
 parlementaire_presences_type:
   url: /:slug/presences/:type
@@ -470 +470 @@
 parlementaire_questions_rss:
   url: /:slug/questions/rss
-  param: {module: parlementaire, action: rss, object_type: QuestionEcrite, title: "Toutes les questions écrites de %"}
+  param: {module: parlementaire, action: rss, object_name: QuestionEcrite, title: "Toutes les questions écrites de %"}
 parlementaire_documents:
   url: /:slug/documents/:type
@@ -476 +476 @@
 parlementaire_documents_rss:
   url: /:slug/documents/:type/rss
-  param: {module: parlementaire, action: rss, object_type: Document, title: "Tous les documents parlementaires de %"}
-
+  param: {module: parlementaire, action: rss, object_name: Document, title: "Tous les documents parlementaires de %"}
+

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

@@ -70 +70 @@
     }
     //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, "facet.date.include" => "edge");
+    $params = array('hl'=>'true', 'fl' => 'id,object_id,object_name,date,description', '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';
 
@@ -212 +212 @@
         $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $high_res));
       } 
-      else $this->results['docs'][$i]['highlighting'] = '';
+      else $this->results['docs'][$i]['highlighting'] = $this->results['docs'][$i]['description'];
     }