Changeset 1718
- Timestamp:
- Oct 11, 2010, 12:52:45 AM (10 years ago)
- Location:
- cpc/trunk/project/apps/frontend
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
cpc/trunk/project/apps/frontend/config/routing.yml
r1670 r1718 1 1 # default rules 2 2 #Solr Search 3 recherche_home: 4 url: /recherche/ 5 param: {module: solr, action: search, query: ""} 6 3 7 recherche_solr: 4 8 url: /recherche/:query 5 9 param: {module: solr, action: search, query: ""} 10 options: 11 segment_separators: [/] 6 12 7 13 document: -
cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php
r1717 r1718 48 48 49 49 $query = preg_replace('/\*/', '', $this->query); 50 $query = preg_replace('/\.\.+/', '', $query);51 50 52 51 $nb = 20; … … 230 229 $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $high_res)); 231 230 } 232 else if ( $this->query != "") {231 else if (isset($this->results['docs'][$i]['description'])) { 233 232 $this->results['docs'][$i]['highlighting'] = $this->results['docs'][$i]['description']; 234 233 if (strlen($this->results['docs'][$i]['highlighting']) > 700) 235 234 $this->results['docs'][$i]['highlighting'] = preg_replace('/[^ ]*$/', '', substr($this->results['docs'][$i]['description'], 0, 700)).'...'; 236 } 235 } else $this->results['docs'][$i]['highlighting'] = ""; 237 236 } 238 237 -
cpc/trunk/project/apps/frontend/modules/solr/templates/_searchbox.php
r1717 r1718 3 3 <p> 4 4 <input name="search" id="search" value="<?php echo str_replace('"', '"', strip_tags($sf_request->getParameter('query'))); ?>" /> 5 <input t ype="submit" value="Rechercher"/>5 <input title="Rechercher sur NosDéputés.fr" type="submit" value="Rechercher"/> 6 6 </p> 7 7 </form> -
cpc/trunk/project/apps/frontend/modules/solr/templates/rssSuccess.php
r1648 r1718 4 4 if ($title) 5 5 $feed->setTitle("NosDeputes.fr : $title"); 6 else 7 $feed->setTitle("NosDeputes.fr : Recherche sur $query"); 6 else if ($query === "") 7 $feed->setTitle("Les derniers enregistrements sur NosDéputés.fr"); 8 else 9 $feed->setTitle("NosDéputés.fr : Recherche sur $query"); 8 10 $feed->setLink('http://'.$_SERVER['HTTP_HOST'].url_for('@recherche_solr?query='.$query)); 9 11 -
cpc/trunk/project/apps/frontend/modules/solr/templates/searchSuccess.php
r1714 r1718 1 1 <?php 2 $sf_response->setTitle("Recherche de $query"); $style = "xneth"; 2 if ($query === "") 3 $sf_response->setTitle("Recherche sur NosDéputés.fr"); 4 else $sf_response->setTitle("Recherche de $query"); 5 $style = "xneth"; 3 6 4 7 function url_search($query, $args) … … 57 60 $intitule_resultats = 'Recherche de « <em>'.$recherche.'</em> » '; 58 61 } 62 if ($query === "") 63 $intitule_resultats = 'Tous les résultats'; 59 64 60 65 //////////////////// DEBUT SANS AJAX ///////////////////// -
cpc/trunk/project/apps/frontend/templates/layout.php
r1667 r1718 83 83 <form action="<?php echo url_for('@recherche_solr'); ?>" method="get"> 84 84 <p> 85 <input class="rechercher <?php echo$extraclass; ?>" name="search" type="text" size="25" value="<?php echo str_replace('"', '"', $search); ?>"/>86 <input class="bouton_ok" value="" type="submit"/>87 85 <input class="rechercher<?php echo " ".$extraclass; ?>" name="search" type="text" size="25" value="<?php echo str_replace('"', '"', $search); ?>"/> 86 <input title="Rechercher sur NosDéputés.fr" class="bouton_ok" value="" type="submit"/> 87 </p> 88 88 </form> 89 89 </div>
Note: See TracChangeset
for help on using the changeset viewer.