X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch%2Fsearch.inc.php;h=9c4a8a28f36bf62e3a5bdf4fee6c10e8f124e1ab;hb=c7139c07c6b79ac1c1792ae771f48e20510ba030;hp=e988fafb9d834d6941f2c502f74344afc85bab5c;hpb=c94023bbb29b9049a143099f10353c1cb58a5e63;p=platal.git

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index e988faf..9c4a8a2 100644
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -57,10 +57,12 @@ function advancedSearchFromInput()
     $mapField           = new MapSField('mapid',  array('sgcim.map_id'), array('adresses', 'geoloc_city_in_maps'),
                                         array('amp', 'sgcim'), array(getadr_join('amp'), 'amp.cityid = sgcim.city_id'));
 
-    $entrepriseField    = new RefSField('entreprise', array('ee.entreprise'), 'entreprises', 'ee', 'u.user_id = ee.uid', false);
-    $posteField         = new RefSField('poste', array('ep.poste'), 'entreprises', 'ep', 'u.user_id = ep.uid', false);
-    $fonctionField      = new RefSField('fonction', array('en.fonction'), 'entreprises', 'en', 'u.user_id = en.uid');
-    $secteurField       = new RefSField('secteur', array('fm.secteur'), 'entreprises', 'fm', 'u.user_id = fm.uid');
+    $entrepriseField    = new RefSField('entreprise', array('ee.name'), 'profile_job_enum', 'ee',
+                                        'u.user_id = profile_job.uid AND profile_job.jobid = profile_job_enum.id', false);
+    $posteField         = new RefSField('poste', array('ep.description'), 'profile_job', 'ep', 'u.user_id = ep.uid', false);
+    $fonctionField      = new RefSField('fonction', array('en.fonction_fr'), 'fonctions_def', 'en',
+                                        'u.user_id = profile_job.uid AND fonctions_def.id = profile_job.functionid');
+    $secteurField       = new RefSField('secteur', array('fm.sectorid'), 'profile_job', 'fm', 'u.user_id = fm.uid');
     $cvField            = new RefSField('cv', array('u.cv'), '', '', '', false);
 
     $natField           = new RefSField('nationalite', array('u.nationalite', 'u.nationalite2', 'u.nationalite3'), '', '', '');