Changeset 1467

Timestamp:

Sep 28, 2010, 4:08:02 PM (10 years ago)

Author:

teymour

Message:

Migration des urls de recherche vers solr

Location:

cpc/trunk/project/apps/frontend

Files:

• config/routing.yml (modified) (6 diffs)
• modules/api/actions/actions.class.php (modified) (3 diffs)
• modules/solr/actions/actions.class.php (modified) (5 diffs)
• modules/solr/templates/csvSuccess.php (modified) (1 diff)
• modules/solr/templates/jsonSuccess.php (modified) (1 diff)
• modules/solr/templates/xmlSuccess.php (modified) (1 diff)

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

@@ -109 +109 @@
   url: /id/:id
   param: {module: parlementaire, action: id}
-depute_id_type:
-  url: /id/:id/:type
+depute_id_format:
+  url: /id/:id/:format
   param: {module: parlementaire, action: id}
 parlementaire_id:
   url: /parlementaire/id/:id
   param: {module: parlementaire, action: id}
-parlementaire_id_type:
-  url: /parlementaire/id/:id/:type
+parlementaire_id_format:
+  url: /parlementaire/id/:id/:format
   param: {module: parlementaire, action: id}
 # Liste de tous les parlementaires ou par catégorie
@@ -126 +126 @@
   param: {module: parlementaire, action: tag}
 list_parlementaires_search:
-  url: /deputes/rechercher/:search
-  param: {module: parlementaire, action: list}
-list_parlementaires_search_empty:
-  url: /deputes/rechercher/
-  param: {module: parlementaire, action: list}
+  url: /deputes/rechercher/:query
+  param: {module: solr, action: redirect, object_name: Parlementaire}
 list_parlementaires_json:
   url: /deputes/json
-  param: {module: api, action: listParlementaires, type: json}
+  param: {module: api, action: listParlementaires, format: json}
 list_parlementaires_xml:
   url: /deputes/xml
-  param: {module: api, action: listParlementaires, type: xml}
+  param: {module: api, action: listParlementaires, format: xml}
 list_parlementaires_csv:
   url: /deputes/csv
-  param: {module: api, action: listParlementaires, type: csv}
+  param: {module: api, action: listParlementaires, format: csv}
 list_parlementaires_alpha:
-  url: /deputes/:search
-  param: {module: parlementaire, action: list}
+  url: /deputes/:query
+  param: {module: solr, action: redirect, object_name: Parlementaire}
 list_parlementaires:
   url: /deputes
@@ -238 +235 @@
 
 # Recherche lexicale d'interventions ou d'amendements
-search:
-  url: /rechercher
-  param: {module: search, action: index}
 search_interventions_mots_rss:
-  url: /rechercher/interventions/:search/rss
-  param: {module: intervention, action: search, rss: 1}
+  url: /rechercher/interventions/:query/rss
+  param: {module: solr, action: redirect, object_name: Intervention, format: rss}
 search_interventions_mots:
-  url: /rechercher/interventions/:search
-  param: {module: intervention, action: search}
+  url: /rechercher/interventions/:query
+  param: {module: solr, action: redirect, object_name: Intervention}
 search_interventions:
   url: /rechercher/interventions/
-  param: {module: intervention, action: search}
+  param: {module: solr, action: redirect, object_name: Intervention}
 search_amendements_mots_rss:
-  url: /rechercher/amendements/:search/rss
-  param: {module: amendement, action: search, rss: 1}
+  url: /rechercher/amendements/:query/rss
+  param: {module: solr, action: redirect, object_name: Amendement, format: rss}
 search_amendements_mots:
-  url: /rechercher/amendements/:search
-  param: {module: amendement, action: search}
+  url: /rechercher/amendements/:query
+  param: {module: solr, action: redirect, object_name: Amendement, action: search}
 search_amendements:
   url: /rechercher/amendements/
-  param: {module: amendement, action: search}
+  param: {module: solr, action: redirect, object_name: Amendement}
 search_questions_ecrites_mots_rss:
-  url: /rechercher/questions/:search/rss
-  param: {module: questions, action: search, rss: 1}
+  url: /rechercher/questions/:query/rss
+  param: {module: solr, action: redirect, object_name: QuestionEcrite, format: rss}
 search_questions_ecrites_mots:
-  url: /rechercher/questions/:search
-  param: {module: questions, action: search}
+  url: /rechercher/questions/:query
+  param: {module: solr, action: redirect, object_name: QuestionEcrite}
 search_questions_ecrites:
   url: /rechercher/questions/
-  param: {module: questions, action: search}
+  param: {module: solr, action: redirect, object_name: QuestionEcrite}
 
 
@@ -295 +289 @@
   param: {module: parlementaire, action: top}
 api_synthese:
-  url: /synthese/:date/:type
+  url: /synthese/:date/:format
   param: {module: api, action: top}
 
 api_document:
-  url: /api/document/:class/:id/:type
+  url: /api/document/:class/:id/:format
   param: {module: api, action: document}
 
@@ -410 +404 @@
 parlementaire_api_xml:
   url: /:slug/xml
-  param: {module: api, action: parlementaire, type: xml}
+  param: {module: api, action: parlementaire, format: xml}
 parlementaire_api_json:
   url: /:slug/json
-  param: {module: api, action: parlementaire, type: json}
+  param: {module: api, action: parlementaire, format: json}
 parlementaire_api_csv:
   url: /:slug/csv
-  param: {module: api, action: parlementaire, type: csv}
+  param: {module: api, action: parlementaire, format: csv}
 parlementaire_interventions:
   url: /:slug/interventions/:type
-  param: {module: intervention, action: parlementaire}
+  param: {module: intervention, action: parlementaire, type: all}
 parlementaire_interventions_organisme:
   url: /:slug/organisme/:orga/interventions/
@@ -434 +428 @@
 parlementaire_rss_commentaires:
   url: /:slug/commentaires/rss
-  param: {module: commentaire, action: list, rss: 1}
+  param: {module: solr, action: redirect, object_name: Commentaire, format: rss}
 parlementaire_commentaires:
   url: /:slug/commentaires

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

@@ -18 +18 @@
   {
     $class = $request->getParameter('class');
-    $type = $request->getParameter('type');
+    $format = $request->getParameter('format');
     $id = $request->getParameter('id');
     $this->forward404Unless($class);
     $o = doctrine::getTable($class)->find($id);
     if ($class == 'Parlementaire') {
-      return $this->redirect('api/parlementaire?slug='.$o->slug.'&type='.$type);
+      return $this->redirect('api/parlementaire?slug='.$o->slug.'&format='.$format);
     }
     $slug = $class.'_'.$id;
@@ -105 +105 @@
       if ($dep->fin_mandat) 
         $depute['ancien_depute'] = 1;
-      else if ($request->getParameter('type') == 'csv')
+      else if ($request->getParameter('format') == 'csv')
         $depute['ancien_depute'] = 0;
       $this->champs['ancien_depute'] = 1;
       $depute['mandat_debut'] = $dep->debut_mandat;
       $this->champs['mandat_debut'] = 1;
-      if ($request->getParameter('type') == 'csv' || $dep->fin_mandat)
+      if ($request->getParameter('format') == 'csv' || $dep->fin_mandat)
         $depute['mandat_fin'] = $dep->fin_mandat;
       $this->champs['mandat_fin'] = 1;
-      $depute['api_url'] = 'http://'.$_SERVER['HTTP_HOST'].url_for('api/parlementaire?type='.$request->getParameter('type').'&slug='.$dep->slug);
+      $depute['api_url'] = 'http://'.$_SERVER['HTTP_HOST'].url_for('api/parlementaire?format='.$request->getParameter('format').'&slug='.$dep->slug);
       $this->champs['api_url'] = 1;
       $this->res['deputes'][] = array('depute' => $depute);
@@ -161 +161 @@
   private function templatize($request, $filename) {
     $this->setLayout(false);
-    switch($request->getParameter('type')) {
+    switch($request->getParameter('format')) {
       case 'json':
         $this->setTemplate('json');

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

@@ -73 +73 @@
     $date = $request->getParameter('date');
     $from = $request->getParameter('from');
-    $type = $request->getParameter('type');
+    $format = $request->getParameter('format');
 
     $this->tags = 0;
-    if ($type) {
+    if ($format) {
       sfConfig::set('sf_web_debug', false);
       $this->tags = $request->getParameter('tags');
-      $this->type = $type;
-    }
-
-    if ($type == 'rss') {
+      $this->format = $format;
+    }
+
+    if ($format == 'rss') {
       $this->setTemplate('rss');
       $this->feed = new sfRssFeed();
@@ -91 +91 @@
     }
 
-    if ($type == 'json') {
+    if ($format == 'json') {
       $this->getResponse()->setContentType('text/plain; charset=utf-8');
       $this->setTemplate('json');
@@ -97 +97 @@
     }
 
-    if ($type == 'xml') {
+    if ($format == 'xml') {
       $this->getResponse()->setContentType('text/xml; charset=utf-8');
       $this->setTemplate('xml');
@@ -103 +103 @@
     }
 
-    if ($type == 'csv') {
+    if ($format == 'csv') {
       //      $this->getResponse()->setContentType('application/csv; charset=utf-8');
       $this->getResponse()->setContentType('text/plain; charset=utf-8');
@@ -200 +200 @@
     }
   }
+  public function executeRedirect(sfWebRequest $request)
+  {
+    $add = '';
+    if ($p = $request->getParameter('format')) {
+      $add .= '&format='.$p;
+    }
+    if ($p = $request->getParameter('object_name')) {
+      $add .= '&object_name='.$p;
+    }
+    if ($p = $request->getParameter('slug')) {
+      $add .= '&tag=parlementaire='.preg_replace('/\-/', '+', $p);
+    }
+    return $this->redirect('solr/search?query='.$request->getParameter('query').$add);
+  }
 }

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

@@ -9 +9 @@
   echo ";";
   echo $record['object']->id;
-  echo url_for('@api_document?type='.$type.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\n";
+  echo url_for('@api_document?format='.$format.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\n";
   echo ";\n";
 }

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

@@ -10 +10 @@
   echo "[document_type:\"".get_class($record['object'])."\",";
   echo "document_id:".$record['object']->id.",";
-  echo "document_url:\"".sfConfig::get('app_baseurl').url_for('@api_document?type='.$type.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\"]";
+  echo "document_url:\"".sfConfig::get('app_baseurl').url_for('@api_document?format='.$format.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\"]";
 }
 ?> }}<?php return;

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

@@ -11 +11 @@
   echo "<document_type>".get_class($record['object'])."</document_type>";
   echo "<document_id>".$record['object']->id."</document_id>";
-  echo "<document_url>".sfConfig::get('app_base_url').url_for('@api_document?type='.$type.'&class='.get_class($record['object']).'&id='.$record['object']->id)."</document_url>";
+  echo "<document_url>".sfConfig::get('app_base_url').url_for('@api_document?format='.$format.'&class='.get_class($record['object']).'&id='.$record['object']->id)."</document_url>";
   echo "</result>\n";
 }