Changeset 1467
- Timestamp:
- Sep 28, 2010, 4:08:02 PM (10 years ago)
- Location:
- cpc/trunk/project/apps/frontend
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
cpc/trunk/project/apps/frontend/config/routing.yml
r1463 r1467 109 109 url: /id/:id 110 110 param: {module: parlementaire, action: id} 111 depute_id_ type:112 url: /id/:id/: type111 depute_id_format: 112 url: /id/:id/:format 113 113 param: {module: parlementaire, action: id} 114 114 parlementaire_id: 115 115 url: /parlementaire/id/:id 116 116 param: {module: parlementaire, action: id} 117 parlementaire_id_ type:118 url: /parlementaire/id/:id/: type117 parlementaire_id_format: 118 url: /parlementaire/id/:id/:format 119 119 param: {module: parlementaire, action: id} 120 120 # Liste de tous les parlementaires ou par catégorie … … 126 126 param: {module: parlementaire, action: tag} 127 127 list_parlementaires_search: 128 url: /deputes/rechercher/:search 129 param: {module: parlementaire, action: list} 130 list_parlementaires_search_empty: 131 url: /deputes/rechercher/ 132 param: {module: parlementaire, action: list} 128 url: /deputes/rechercher/:query 129 param: {module: solr, action: redirect, object_name: Parlementaire} 133 130 list_parlementaires_json: 134 131 url: /deputes/json 135 param: {module: api, action: listParlementaires, type: json}132 param: {module: api, action: listParlementaires, format: json} 136 133 list_parlementaires_xml: 137 134 url: /deputes/xml 138 param: {module: api, action: listParlementaires, type: xml}135 param: {module: api, action: listParlementaires, format: xml} 139 136 list_parlementaires_csv: 140 137 url: /deputes/csv 141 param: {module: api, action: listParlementaires, type: csv}138 param: {module: api, action: listParlementaires, format: csv} 142 139 list_parlementaires_alpha: 143 url: /deputes/: search144 param: {module: parlementaire, action: list}140 url: /deputes/:query 141 param: {module: solr, action: redirect, object_name: Parlementaire} 145 142 list_parlementaires: 146 143 url: /deputes … … 238 235 239 236 # Recherche lexicale d'interventions ou d'amendements 240 search:241 url: /rechercher242 param: {module: search, action: index}243 237 search_interventions_mots_rss: 244 url: /rechercher/interventions/: search/rss245 param: {module: intervention, action: search, rss: 1}238 url: /rechercher/interventions/:query/rss 239 param: {module: solr, action: redirect, object_name: Intervention, format: rss} 246 240 search_interventions_mots: 247 url: /rechercher/interventions/: search248 param: {module: intervention, action: search}241 url: /rechercher/interventions/:query 242 param: {module: solr, action: redirect, object_name: Intervention} 249 243 search_interventions: 250 244 url: /rechercher/interventions/ 251 param: {module: intervention, action: search}245 param: {module: solr, action: redirect, object_name: Intervention} 252 246 search_amendements_mots_rss: 253 url: /rechercher/amendements/: search/rss254 param: {module: amendement, action: search, rss: 1}247 url: /rechercher/amendements/:query/rss 248 param: {module: solr, action: redirect, object_name: Amendement, format: rss} 255 249 search_amendements_mots: 256 url: /rechercher/amendements/: search257 param: {module: amendement, action: search}250 url: /rechercher/amendements/:query 251 param: {module: solr, action: redirect, object_name: Amendement, action: search} 258 252 search_amendements: 259 253 url: /rechercher/amendements/ 260 param: {module: amendement, action: search}254 param: {module: solr, action: redirect, object_name: Amendement} 261 255 search_questions_ecrites_mots_rss: 262 url: /rechercher/questions/: search/rss263 param: {module: questions, action: search, rss: 1}256 url: /rechercher/questions/:query/rss 257 param: {module: solr, action: redirect, object_name: QuestionEcrite, format: rss} 264 258 search_questions_ecrites_mots: 265 url: /rechercher/questions/: search266 param: {module: questions, action: search}259 url: /rechercher/questions/:query 260 param: {module: solr, action: redirect, object_name: QuestionEcrite} 267 261 search_questions_ecrites: 268 262 url: /rechercher/questions/ 269 param: {module: questions, action: search}263 param: {module: solr, action: redirect, object_name: QuestionEcrite} 270 264 271 265 … … 295 289 param: {module: parlementaire, action: top} 296 290 api_synthese: 297 url: /synthese/:date/: type291 url: /synthese/:date/:format 298 292 param: {module: api, action: top} 299 293 300 294 api_document: 301 url: /api/document/:class/:id/: type295 url: /api/document/:class/:id/:format 302 296 param: {module: api, action: document} 303 297 … … 410 404 parlementaire_api_xml: 411 405 url: /:slug/xml 412 param: {module: api, action: parlementaire, type: xml}406 param: {module: api, action: parlementaire, format: xml} 413 407 parlementaire_api_json: 414 408 url: /:slug/json 415 param: {module: api, action: parlementaire, type: json}409 param: {module: api, action: parlementaire, format: json} 416 410 parlementaire_api_csv: 417 411 url: /:slug/csv 418 param: {module: api, action: parlementaire, type: csv}412 param: {module: api, action: parlementaire, format: csv} 419 413 parlementaire_interventions: 420 414 url: /:slug/interventions/:type 421 param: {module: intervention, action: parlementaire }415 param: {module: intervention, action: parlementaire, type: all} 422 416 parlementaire_interventions_organisme: 423 417 url: /:slug/organisme/:orga/interventions/ … … 434 428 parlementaire_rss_commentaires: 435 429 url: /:slug/commentaires/rss 436 param: {module: commentaire, action: list, rss: 1}430 param: {module: solr, action: redirect, object_name: Commentaire, format: rss} 437 431 parlementaire_commentaires: 438 432 url: /:slug/commentaires -
cpc/trunk/project/apps/frontend/modules/api/actions/actions.class.php
r1449 r1467 18 18 { 19 19 $class = $request->getParameter('class'); 20 $ type = $request->getParameter('type');20 $format = $request->getParameter('format'); 21 21 $id = $request->getParameter('id'); 22 22 $this->forward404Unless($class); 23 23 $o = doctrine::getTable($class)->find($id); 24 24 if ($class == 'Parlementaire') { 25 return $this->redirect('api/parlementaire?slug='.$o->slug.'& type='.$type);25 return $this->redirect('api/parlementaire?slug='.$o->slug.'&format='.$format); 26 26 } 27 27 $slug = $class.'_'.$id; … … 105 105 if ($dep->fin_mandat) 106 106 $depute['ancien_depute'] = 1; 107 else if ($request->getParameter(' type') == 'csv')107 else if ($request->getParameter('format') == 'csv') 108 108 $depute['ancien_depute'] = 0; 109 109 $this->champs['ancien_depute'] = 1; 110 110 $depute['mandat_debut'] = $dep->debut_mandat; 111 111 $this->champs['mandat_debut'] = 1; 112 if ($request->getParameter(' type') == 'csv' || $dep->fin_mandat)112 if ($request->getParameter('format') == 'csv' || $dep->fin_mandat) 113 113 $depute['mandat_fin'] = $dep->fin_mandat; 114 114 $this->champs['mandat_fin'] = 1; 115 $depute['api_url'] = 'http://'.$_SERVER['HTTP_HOST'].url_for('api/parlementaire? type='.$request->getParameter('type').'&slug='.$dep->slug);115 $depute['api_url'] = 'http://'.$_SERVER['HTTP_HOST'].url_for('api/parlementaire?format='.$request->getParameter('format').'&slug='.$dep->slug); 116 116 $this->champs['api_url'] = 1; 117 117 $this->res['deputes'][] = array('depute' => $depute); … … 161 161 private function templatize($request, $filename) { 162 162 $this->setLayout(false); 163 switch($request->getParameter(' type')) {163 switch($request->getParameter('format')) { 164 164 case 'json': 165 165 $this->setTemplate('json'); -
cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php
r1448 r1467 73 73 $date = $request->getParameter('date'); 74 74 $from = $request->getParameter('from'); 75 $ type = $request->getParameter('type');75 $format = $request->getParameter('format'); 76 76 77 77 $this->tags = 0; 78 if ($ type) {78 if ($format) { 79 79 sfConfig::set('sf_web_debug', false); 80 80 $this->tags = $request->getParameter('tags'); 81 $this-> type = $type;82 } 83 84 if ($ type== 'rss') {81 $this->format = $format; 82 } 83 84 if ($format == 'rss') { 85 85 $this->setTemplate('rss'); 86 86 $this->feed = new sfRssFeed(); … … 91 91 } 92 92 93 if ($ type== 'json') {93 if ($format == 'json') { 94 94 $this->getResponse()->setContentType('text/plain; charset=utf-8'); 95 95 $this->setTemplate('json'); … … 97 97 } 98 98 99 if ($ type== 'xml') {99 if ($format == 'xml') { 100 100 $this->getResponse()->setContentType('text/xml; charset=utf-8'); 101 101 $this->setTemplate('xml'); … … 103 103 } 104 104 105 if ($ type== 'csv') {105 if ($format == 'csv') { 106 106 // $this->getResponse()->setContentType('application/csv; charset=utf-8'); 107 107 $this->getResponse()->setContentType('text/plain; charset=utf-8'); … … 200 200 } 201 201 } 202 public function executeRedirect(sfWebRequest $request) 203 { 204 $add = ''; 205 if ($p = $request->getParameter('format')) { 206 $add .= '&format='.$p; 207 } 208 if ($p = $request->getParameter('object_name')) { 209 $add .= '&object_name='.$p; 210 } 211 if ($p = $request->getParameter('slug')) { 212 $add .= '&tag=parlementaire='.preg_replace('/\-/', '+', $p); 213 } 214 return $this->redirect('solr/search?query='.$request->getParameter('query').$add); 215 } 202 216 } -
cpc/trunk/project/apps/frontend/modules/solr/templates/csvSuccess.php
r1462 r1467 9 9 echo ";"; 10 10 echo $record['object']->id; 11 echo url_for('@api_document? type='.$type.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\n";11 echo url_for('@api_document?format='.$format.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\n"; 12 12 echo ";\n"; 13 13 } -
cpc/trunk/project/apps/frontend/modules/solr/templates/jsonSuccess.php
r1461 r1467 10 10 echo "[document_type:\"".get_class($record['object'])."\","; 11 11 echo "document_id:".$record['object']->id.","; 12 echo "document_url:\"".sfConfig::get('app_baseurl').url_for('@api_document? type='.$type.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\"]";12 echo "document_url:\"".sfConfig::get('app_baseurl').url_for('@api_document?format='.$format.'&class='.get_class($record['object']).'&id='.$record['object']->id)."\"]"; 13 13 } 14 14 ?> }}<?php return; -
cpc/trunk/project/apps/frontend/modules/solr/templates/xmlSuccess.php
r1448 r1467 11 11 echo "<document_type>".get_class($record['object'])."</document_type>"; 12 12 echo "<document_id>".$record['object']->id."</document_id>"; 13 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>";13 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>"; 14 14 echo "</result>\n"; 15 15 }
Note: See TracChangeset
for help on using the changeset viewer.