X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=5d474f5d51e7214f2dc4db1d2c440cd811a32bd1;hb=bdbda592dfa0fe34eb359adf1f90082ec313b8fb;hp=72a09ac1cdd17a8da36135aeeb69cdee52b16494;hpb=843a2191e4c76f0beb00c754f06974de76791238;p=platal.git diff --git a/modules/search.php b/modules/search.php index 72a09ac..5d474f5 100644 --- a/modules/search.php +++ b/modules/search.php @@ -25,10 +25,14 @@ class SearchModule extends PLModule { return array( 'search' => $this->make_hook('quick', AUTH_PUBLIC), - 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE), + 'search/adv' => $this->make_hook('advanced', AUTH_COOKIE, 'directory_ax'), 'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC), - 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH), - 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH), + 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'jobs' => $this->make_hook('referent', AUTH_COOKIE), + 'emploi' => $this->make_hook('referent', AUTH_COOKIE), + 'referent/search' => $this->make_hook('referent', AUTH_COOKIE), + 'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE), ); } @@ -43,11 +47,15 @@ class SearchModule extends PLModule Platal::page()->assign('formulaire',1); } - function handler_quick(&$page, $action = null, $subaction = null) + /** + * $model: The way of presenting the results: minifiche, trombi, geoloc. + * $byletter: Show only names beginning with this letter + */ + function handler_quick(&$page, $model = null, $byletter = null) { global $globals; - if (Env::has('quick') || $action == 'geoloc') { + if (Env::has('quick') || $model == 'geoloc') { $quick = Env::t('quick'); if (S::logged() && !Env::has('page')) { S::logger()->log('search', 'quick=' . $quick); @@ -110,20 +118,17 @@ class SearchModule extends PLModule $page->assign('formulaire', 0); require_once 'userset.inc.php'; - $view = new SearchSet(true, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Mini-fiches', true, array('with_score' => true)); + $view = new SearchSet(true); + $view->addMod('minifiche', 'Mini-fiches', true, array('with_score' => true, 'starts_with' => $byletter)); if (S::logged() && !Env::i('nonins')) { $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true, 'with_score' => true)); // TODO: Reactivate when the new map is completed. // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); } - $view->apply('search', $page, $action, $subaction); + $view->apply('search', $page, $model); $nb_tot = $view->count(); $page->assign('search_results_nb', $nb_tot); - if ($subaction) { - return; - } if (!S::logged() && $nb_tot > $globals->search->public_max) { $page->trigError('Votre recherche a généré trop de résultats pour un affichage public.'); } elseif ($nb_tot > $globals->search->private_max) { @@ -140,14 +145,15 @@ class SearchModule extends PLModule $page->setTitle('Annuaire'); } - function handler_advanced(&$page, $action = null, $subaction = null) + /** $model is the way of presenting the results: minifiche, trombi, geoloc. + */ + function handler_advanced(&$page, $model = null, $byletter = null) { global $globals; - require_once 'geocoding.inc.php'; $page->assign('advanced',1); $page->addJsLink('jquery.autocomplete.js'); - if (!Env::has('rechercher') && $action != 'geoloc') { + if (!Env::has('rechercher') && $model != 'geoloc') { $this->form_prepare(); } else { if (!Env::has('page')) { @@ -155,27 +161,29 @@ class SearchModule extends PLModule } require_once 'userset.inc.php'; - $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Mini-fiches', true); - $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true)); - // TODO: Reactivate when the new map is completed. - // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); - $view->apply('search/adv', $page, $action, $subaction); - - if ($subaction) { - return; - } - $nb_tot = $view->count(); - if ($nb_tot > $globals->search->private_max) { + $view = new SearchSet(false); + if (!$view->isValid()) { $this->form_prepare(); - $page->trigError('Recherche trop générale.'); - } else if ($nb_tot == 0) { - $this->form_prepare(); - $page->trigError('Il n\'existe personne correspondant à ces critères dans la base !'); + $page->trigError('Recherche invalide.'); + } else { + $view->addMod('minifiche', 'Mini-fiches', true, array('starts_with' => $byletter)); + $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true)); + // TODO: Reactivate when the new map is completed. + // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); + $view->apply('search/adv', $page, $model); + + $nb_tot = $view->count(); + if ($nb_tot > $globals->search->private_max) { + $this->form_prepare(); + $page->trigError('Recherche trop générale.'); + } else if ($nb_tot == 0) { + $this->form_prepare(); + $page->trigError('Il n\'existe personne correspondant à ces critères dans la base !'); + } } } - $page->changeTpl('search/index.tpl', $action == 'mini' ? SIMPLE : SKINNED); + $page->changeTpl('search/index.tpl', $model == 'mini' ? SIMPLE : SKINNED); $page->addJsLink('ajax.js'); $page->assign('public_directory',0); } @@ -218,7 +226,7 @@ class SearchModule extends PLModule 'city' => DirEnum::LOCALITIES, 'countryTxt' => DirEnum::COUNTRIES, 'entreprise' => DirEnum::COMPANIES, - 'secteurTxt' => DirEnum::SECTORS, + 'jobtermTxt' => DirEnum::JOBTERMS, 'description' => DirEnum::JOBDESCRIPTION, 'nationaliteTxt' => DirEnum::NATIONALITIES, 'schoolTxt' => DirEnum::EDUSCHOOLS, @@ -247,6 +255,9 @@ class SearchModule extends PLModule $res .= "\n"; } } + if ($nbResults == 0) { + $res = $q."|-2\n"; + } XDB::query('REPLACE INTO search_autocomplete VALUES ({?}, {?}, {?}, NOW())', $type, $q, $res); @@ -301,9 +312,22 @@ class SearchModule extends PLModule case 'section': $ids = DirEnum::getOptionsIter(DirEnum::SECTIONS); break; - case 'secteur': - $ids = DirEnum::getOptionsIter(DirEnum::SECTORS); - break; + case 'jobterm': + if (Env::has('jtid')) { + JobTerms::ajaxGetBranch(&$page, JobTerms::ONLY_JOBS); + return; + } else { + pl_content_headers('text/xml'); + echo '
'; // global container so that response is valid xml + echo ''; + echo ''; + echo '
'; // container where to create the tree + echo ''; + echo ''; + echo ''; + echo '
'; + exit(); + } default: exit(); } if (isset($idVal)) { @@ -315,6 +339,65 @@ class SearchModule extends PLModule $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('list', $ids); } + + function handler_referent(&$page, $action = null, $subaction = null) + { + global $globals; + + $wp = new PlWikiPage('Docs.Emploi'); + $wp->buildCache(); + + $page->setTitle('Emploi et Carrières'); + + // Count mentors + $res = XDB::query("SELECT count(distinct pid) FROM profile_mentor_term"); + $page->assign('mentors_number', $res->fetchOneCell()); + + $page->addJsLink('jquery.autocomplete.js'); + + // Search for mentors matching filters + require_once 'ufbuilder.inc.php'; + $ufb = new UFB_MentorSearch(); + if (!$ufb->isEmpty()) { + require_once 'userset.inc.php'; + $ufc = $ufb->getUFC(); + $set = new ProfileSet($ufc); + $set->addMod('mentor', 'Référents'); + $set->apply('referent/search', $page, $action, $subaction); + $nb_tot = $set->count(); + if ($nb_tot > $globals->search->private_max) { + $this->form_prepare(); + $page->trigError('Recherche trop générale.'); + $page->assign('plset_count', 0); + } else if ($nb_tot == 0) { + $this->form_prepare(); + $page->trigError('Il n\'existe personne correspondant à ces critères dans la base.'); + } + } + + $page->changeTpl('search/referent.tpl'); + } + + /** + * Builds a select field to choose among countries that referents + * know about. Only referents linked to term (jtid) are displayed. + * @param $jtid id of job term to restrict referents + */ + function handler_referent_countries(&$page, $jtid = null) + { + pl_content_headers("text/xml"); + $page->changeTpl('include/field.select.tpl', NO_SKIN); + $page->assign('name', 'country'); + $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.countryFR AS field + FROM geoloc_countries AS gc + INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2) + INNER JOIN profile_mentor_term AS mt ON (mt.pid = mp.pid) + INNER JOIN profile_job_term_relation AS jtr ON (jtr.jtid_2 = mt.jtid) + WHERE jtr.jtid_1 = {?} + GROUP BY iso_3166_1_a2 + ORDER BY countryFR", $jtid); + $page->assign('list', $it); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: