identification disappeared, now auth_user_md5 only

diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index ba2e116..dc43b27 100644 (file)
--- a/include/search.classes.inc.php
+++ b/include/search.classes.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.classes.inc.php,v 1.27 2004-10-29 01:24:20 x2000habouzit Exp $
+        $Id: search.classes.inc.php,v 1.28 2004-10-31 17:45:15 x2000chevalier Exp $
  ***************************************************************************/
 
 require_once("xorg.misc.inc.php");
@@ -28,8 +28,8 @@ require_once("xorg.misc.inc.php");
  */
 $globals->search_result_fields = '
                 u.epouse,u.date,u.web,u.mobile,
-                i.deces!=0 AS dcd,i.deces,
-               FIND_IN_SET(\'femme\', i.flags) AS sexe,
+                u.deces!=0 AS dcd,u.deces,
+               FIND_IN_SET(\'femme\', u.flags) AS sexe,
                 ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                 ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                 e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,

diff --git a/scripts/cron/recherche.sql b/scripts/cron/recherche.sql
index 3b10b07..35ad285 100644 (file)
--- a/scripts/cron/recherche.sql
+++ b/scripts/cron/recherche.sql
@@ -1,9 +1,9 @@
 USE x4dat;
 DROP TABLE IF EXISTS recherche;
-CREATE TABLE recherche SELECT i.matricule AS matricule,LOWER(REPLACE(i.nom,'-',' ')) AS nom1,
-LOWER(REPLACE(u.nom,'-',' ')) AS nom2, LOWER(REPLACE(u.epouse,'-',' ')) AS nom3,
-LOWER(REPLACE(i.prenom,'-',' ')) AS prenom1, LOWER(REPLACE(u.prenom,'-',' ')) AS prenom2,i.promo AS
-promo FROM identification AS i LEFT JOIN auth_user_md5 AS u ON (u.matricule=i.matricule);
+CREATE TABLE recherche SELECT matricule AS matricule,LOWER(REPLACE(nom_ini,'-',' ')) AS nom1,
+LOWER(REPLACE(nom,'-',' ')) AS nom2, LOWER(REPLACE(epouse,'-',' ')) AS nom3,
+LOWER(REPLACE(prenom_ini,'-',' ')) AS prenom1, LOWER(REPLACE(prenom,'-',' ')) AS prenom2, promo AS
+promo FROM auth_user_md5;
 DROP TABLE IF EXISTS recherche_soundex;
 CREATE TABLE recherche_soundex (matricule int(8) unsigned PRIMARY KEY,nom1_soundex
 char(4),nom2_soundex char(4),nom3_soundex char(4),prenom1_soundex char(4),prenom2_soundex char(4),