Changeset 1718

Timestamp:

Oct 11, 2010, 12:52:45 AM (11 years ago)

Author:

roux

Message:

urls correctes pour recherche avec . dedans

Location:

cpc/trunk/project/apps/frontend

Files:

• config/routing.yml (modified) (1 diff)
• modules/solr/actions/actions.class.php (modified) (2 diffs)
• modules/solr/templates/_searchbox.php (modified) (1 diff)
• modules/solr/templates/rssSuccess.php (modified) (1 diff)
• modules/solr/templates/searchSuccess.php (modified) (2 diffs)
• templates/layout.php (modified) (1 diff)

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

@@ -1 +1 @@
 # default rules
 #Solr Search
+recherche_home:
+  url: /recherche/
+  param: {module: solr, action: search, query: ""}
+
 recherche_solr:
   url: /recherche/:query
   param: {module: solr, action: search, query: ""}
+  options:
+    segment_separators: [/]
 
 document:

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

@@ -48 +48 @@
     
     $query = preg_replace('/\*/', '', $this->query);
-    $query = preg_replace('/\.\.+/', '', $query);
 
     $nb = 20;
@@ -230 +229 @@
         $this->results['docs'][$i]['highlighting'] = preg_replace('/^'."$this->results['docs'][$i]['personne']".'/', '', implode('...', $high_res));
       } 
-      else if ($this->query != "") {
+      else if (isset($this->results['docs'][$i]['description'])) {
         $this->results['docs'][$i]['highlighting'] = $this->results['docs'][$i]['description'];
         if (strlen($this->results['docs'][$i]['highlighting']) > 700) 
            $this->results['docs'][$i]['highlighting'] = preg_replace('/[^ ]*$/', '', substr($this->results['docs'][$i]['description'], 0, 700)).'...';
-      }
+      } else $this->results['docs'][$i]['highlighting'] = "";
     }
     

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

@@ -3 +3 @@
   <p>
      <input name="search" id="search" value="<?php echo str_replace('"', '&quot;', strip_tags($sf_request->getParameter('query'))); ?>" />
-    <input type="submit" value="Rechercher"/>
+    <input title="Rechercher sur NosDéputés.fr" type="submit" value="Rechercher"/>
   </p>
   </form>

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

@@ -4 +4 @@
 if ($title)
   $feed->setTitle("NosDeputes.fr : $title");
- else
-   $feed->setTitle("NosDeputes.fr : Recherche sur $query");
+else if ($query === "")
+  $feed->setTitle("Les derniers enregistrements sur NosDéputés.fr");
+else
+  $feed->setTitle("NosDéputés.fr : Recherche sur $query");
 $feed->setLink('http://'.$_SERVER['HTTP_HOST'].url_for('@recherche_solr?query='.$query));
 

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

@@ -1 +1 @@
 <?php 
-$sf_response->setTitle("Recherche de $query");  $style = "xneth";
+if ($query === "")
+  $sf_response->setTitle("Recherche sur NosDéputés.fr");
+else $sf_response->setTitle("Recherche de $query");
+$style = "xneth";
 
 function url_search($query, $args) 
@@ -57 +60 @@
     $intitule_resultats = 'Recherche de «&nbsp;<em>'.$recherche.'</em>&nbsp;» ';
 }
+if ($query === "")
+  $intitule_resultats = 'Tous les résultats';
 
 //////////////////// DEBUT SANS AJAX /////////////////////

cpc/trunk/project/apps/frontend/templates/layout.php

@@ -83 +83 @@
           <form action="<?php echo url_for('@recherche_solr'); ?>" method="get">
             <p>
-              <input class="rechercher <?php echo $extraclass; ?>" name="search" type="text" size="25" value="<?php echo str_replace('"', '&quot;', $search); ?>"/>
-              <input class="bouton_ok" value="" type="submit"/>
-                        </p>
+              <input class="rechercher<?php echo " ".$extraclass; ?>" name="search" type="text" size="25" value="<?php echo str_replace('"', '&quot;', $search); ?>"/>
+              <input title="Rechercher sur NosDéputés.fr" class="bouton_ok" value="" type="submit"/>
+            </p>
           </form>
         </div>