X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch%2Fclasses.inc.php;h=7ad0e8c87e2f340e98f3b9e0cd31523bba72e3bc;hb=efe597c5795234724bc3df508bd628f9860a9c32;hp=8383991cab68f24796dc94844ddd6ad7e3d5ca76;hpb=32d8754be017db3aa656812fca2a92704ebe29ae;p=platal.git

diff --git a/modules/search/classes.inc.php b/modules/search/classes.inc.php
index 8383991..7ad0e8c 100644
--- a/modules/search/classes.inc.php
+++ b/modules/search/classes.inc.php
@@ -29,7 +29,6 @@
     u.perms IN (\'admin\',\'user\', \'disabled\') AS inscrit,
     u.perms != \'pending\' AS wasinscrit,
     FIND_IN_SET(\'femme\', u.flags) AS sexe,
-    a.alias AS forlife,
     ede0.name AS eduname0, ede0.url AS eduurl0, edd0.degree AS edudegree0,
     edu0.grad_year AS edugrad_year0, f0.field AS edufield0, edu0.program AS eduprogram0,
     ede1.name AS eduname1, ede1.url AS eduurl1, edd1.degree AS edudegree1,
@@ -38,7 +37,7 @@
     edu2.grad_year AS edugrad_year2, f2.field AS edufield2, edu2.program AS eduprogram2,
     ede3.name AS eduname3, ede3.url AS eduurl3, edd3.degree AS edudegree3,
     edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3.program AS eduprogram3,
-    es.label AS secteur, ef.fonction_fr AS fonction,
+    es.name AS secteur, ef.fonction_fr AS fonction,
     IF(n1.nat=\'\',n1.pays,n1.nat) AS nat1, n1.a2 AS iso3166_1,
     IF(n2.nat=\'\',n2.pays,n2.nat) AS nat2, n2.a2 AS iso3166_2,
     IF(n3.nat=\'\',n3.pays,n3.nat) AS nat3, n3.a2 AS iso3166_3,
@@ -48,7 +47,7 @@ if (S::logged())
     $globals->search->result_fields .='
         q.profile_freetext AS freetext,
         adr.city, gp.pays AS countrytxt, gr.name AS region,
-        e.entreprise,
+        ee.name,
         nw.address AS networking_address,
         nwe.name AS networking_name,';
 else
@@ -57,7 +56,7 @@ else
         IF(adr.pub='public', adr.city, '')   AS city,
         IF(adr.pub='public', gp.pays, '')    AS countrytxt,
         IF(adr.pub='public', gr.name, '')    AS region,
-        IF(e.pub='public', e.entreprise, '') AS entreprise,
+        IF(e.pub='public', je.name, '')      AS entreprise,
         IF(nw.pub='public', nw.address, '')  AS networking_address,
         IF(nw.pub='public', nwe.name, '')    AS networking_name,";
 @$globals->search->result_where_statement = '
@@ -77,8 +76,9 @@ else
     LEFT JOIN  profile_education_enum        AS ede3 ON (ede3.id = edu3.eduid)
     LEFT JOIN  profile_education_degree_enum AS edd3 ON (edd3.id = edu3.degreeid)
     LEFT JOIN  profile_education_field_enum  AS f3   ON (f3.id = edu3.fieldid)
-    LEFT JOIN  entreprises                   AS e    ON (e.entrid = 0 AND e.uid = u.user_id)
-    LEFT JOIN  emploi_secteur                AS es   ON (e.secteur = es.id)
+    LEFT JOIN  profile_job                   AS e    ON (e.uid = u.user_id)
+    LEFT JOIN  profile_job_enum              AS ee   ON (e.jobid = ee.id)
+    LEFT JOIN  profile_job_sector_enum       AS es   ON (es.id = e.sectorid)
     LEFT JOIN  fonctions_def                 AS ef   ON (e.fonction = ef.id)
     LEFT JOIN  geoloc_pays                   AS n1   ON (u.nationalite = n1.a2)
     LEFT JOIN  geoloc_pays                   AS n2   ON (u.nationalite2 = n2.a2)