X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch%2Fsearch.inc.php;h=ea82bdeb2c2e22940a41fea46b71e89cc90354cb;hb=0001ba7a34dc3b535407cb1b961781c3c69c0ccd;hp=8d2ef8f0f8f4fa4ccb694529a755071636a69d9b;hpb=f2c150a0b20f222ddadabe7c0a307b60cec86a54;p=platal.git

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index 8d2ef8f..ea82bde 100644
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -28,13 +28,11 @@ function getadr_join($table) {
 function advancedSearchFromInput()
 {
     if ($with_soundex = Env::has('with_soundex')) {
-        $nameField      = new RefWithSoundexSField('name',array('rn.nom1_soundex','rn.nom2_soundex','rn.nom3_soundex'),'recherche_soundex','rn','u.matricule = rn.matricule');
-        $firstnameField = new RefWithSoundexSField('firstname',array('rp.prenom1_soundex','rp.prenom2_soundex'),'recherche_soundex','rp','u.matricule = rp.matricule');
+        $nameField      = new RefWithSoundexSField('name', array('n.soundex'), 'search_name',
+                                                   'n', 'u.user_id = n.uid');
     } else {
-        $nameField      = new NameSField('name', array('u.nom','u.nom_usage'), '');
-        $firstnameField = new StringSField('firstname', array('u.prenom'), '');
+        $nameField      = new NameSField('name', array('n.token'), 'search_name', 'n', 'u.user_id = n.uid');
     }
-    $nicknameField      = new StringSField('nickname', array('q.profile_nick'), '');
 
     $promo1Field        = new PromoSField('promo1', 'egal1', array('u.promo'), '');
     $promo2Field        = new PromoSField('promo2', 'egal2', array('u.promo'), '');
@@ -85,7 +83,7 @@ function advancedSearchFromInput()
     }
     $nwPhoneField       = new PhoneSField('phone_number', array('t.search_tel'), 'profile_phones', 't', 't.uid = u.user_id');
     return array(
-                $nameField, $firstnameField, $nicknameField, $promo1Field,
+                $nameField, $promo1Field,
                 $promo2Field, $womanField, $subscriberField, $aliveField,
                 $townField, $countryField, $regionField, $mapField, $entrepriseField,
                 $posteField, $secteurField, $cvField, $natField, $binetField,