X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=e3bfee7015a19e5d06cb4c614fc035c4b75e9df8;hb=96b778a679b261235ede8c5c4e7356680f4e5895;hp=14383b4db317aaba6e51399f4f5a42e2126b7ca9;hpb=2d89ec936167033886ae76b153605d7ccf19bc20;p=platal.git diff --git a/modules/search.php b/modules/search.php index 14383b4..e3bfee7 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ $this->make_hook('quick', AUTH_PUBLIC), - '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, '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), + 'search' => $this->make_hook('quick', AUTH_PUBLIC), + '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, 'directory_ax', NO_AUTH), + 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'search/list/count' => $this->make_hook('list_count', AUTH_COOKIE, 'directory_ax', NO_AUTH), + 'jobs' => $this->make_hook('referent', AUTH_COOKIE, 'user'), + 'emploi' => $this->make_hook('referent', AUTH_COOKIE, 'user'), + 'referent/search' => $this->make_hook('referent', AUTH_COOKIE, 'user'), + 'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE, 'user'), ); } - function handler_redir_advanced(&$page, $mode = null) + function handler_redir_advanced($page, $mode = null) { pl_redirect('search/adv'); exit; @@ -51,7 +52,7 @@ class SearchModule extends PLModule * $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) + function handler_quick($page, $model = null, $byletter = null) { global $globals; @@ -66,7 +67,6 @@ class SearchModule extends PLModule $page->changeTpl('search/index.tpl'); $page->setTitle('Annuaire'); $page->assign('formulaire', 1); - $page->addJsLink('ajax.js'); return; } @@ -97,8 +97,7 @@ class SearchModule extends PLModule if ($user) { pl_redirect($base . $user->login()); } - $_REQUEST['quick'] = $login; - $_GET['quick'] = $login; + Get::set('quick', $login); } elseif (strpos($quick, 'doc:') === 0) { $url = 'Docs/Recherche?'; $url .= 'action=search&q=' . urlencode(substr($quick, 4)); @@ -120,12 +119,11 @@ class SearchModule extends PLModule $page->assign('formulaire', 0); require_once 'userset.inc.php'; - $view = new SearchSet(true); + $view = new QuickSearchSet(); $view->addMod('minifiche', 'Mini-fiches', true, array('with_score' => true, 'starts_with' => $byletter)); + $view->addMod('map', 'Planisphère'); 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, $model); @@ -140,7 +138,6 @@ class SearchModule extends PLModule } } else { $page->assign('formulaire',1); - $page->addJsLink('ajax.js'); } $page->changeTpl('search/index.tpl'); @@ -149,17 +146,30 @@ class SearchModule extends PLModule /** $model is the way of presenting the results: minifiche, trombi, geoloc. */ - function handler_advanced(&$page, $model = null, $byletter = null) + function handler_advanced($page, $model = null, $byletter = null) { global $globals; + $page->addJsLink('jquery.ui.xorg.js'); + $page->addJsLink('search.js'); $page->assign('advanced',1); - $page->addJsLink('jquery.autocomplete.js'); $networks = DirEnum::getOptions(DirEnum::NETWORKS); $networks[-1] = 'Tous types'; $networks[0] = '-'; ksort($networks); $page->assign('networking_types', $networks); + $origin_corps_list = DirEnum::getOptions(DirEnum::ORIGINCORPS); + $current_corps_list = DirEnum::getOptions(DirEnum::CURRENTCORPS); + $corps_rank_list = DirEnum::getOptions(DirEnum::CORPSRANKS); + $origin_corps_list[0] = '-'; + $current_corps_list[0] = '-'; + $corps_rank_list[0] = '-'; + ksort($origin_corps_list); + ksort($current_corps_list); + ksort($corps_rank_list); + $page->assign('origin_corps_list', $origin_corps_list); + $page->assign('current_corps_list', $current_corps_list); + $page->assign('corps_rank_list', $corps_rank_list); if (!Env::has('rechercher') && $model != 'geoloc') { $this->form_prepare(); @@ -169,15 +179,17 @@ class SearchModule extends PLModule } require_once 'userset.inc.php'; - $view = new SearchSet(false); + // Enable X.org fields for X.org admins, and AX fields for AX secretaries. + $view = new AdvancedSearchSet(S::admin(), + S::user()->checkPerms(User::PERM_EDIT_DIRECTORY)); + if (!$view->isValid()) { $this->form_prepare(); $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->addMod('map', 'Planisphère'); if (S::user()->checkPerms(User::PERM_EDIT_DIRECTORY) || S::admin()) { $view->addMod('addresses', 'Adresses postales', false); } @@ -198,11 +210,15 @@ class SearchModule extends PLModule } $page->changeTpl('search/index.tpl', $model == 'mini' ? SIMPLE : SKINNED); - $page->addJsLink('ajax.js'); $page->assign('public_directory',0); } - function handler_autocomplete(&$page, $type = null) + static public function format_autocomplete(array $item) + { + return $item['field'] . ' (' . $item['nb'] . ' camarade' . ($item['nb'] > 1 ? 's' : '') . ')'; + } + + function handler_autocomplete($page, $type = null, $sub_id = null) { // Autocompletion : according to type required, return // a list of results matching with the number of matches. @@ -217,70 +233,97 @@ class SearchModule extends PLModule array('', '\\\\\1', '.*'), - Env::s('q')); - if (!$q) exit(); - - // try to look in cached results - $cache = XDB::query('SELECT result - FROM search_autocomplete - WHERE name = {?} AND - query = {?} AND - generated > NOW() - INTERVAL 1 DAY', - $type, $q); - if ($res = $cache->fetchOneCell()) { - echo $res; - die(); - } - - $enums = array( - 'binetTxt' => DirEnum::BINETS, - 'groupexTxt' => DirEnum::GROUPESX, - 'sectionTxt' => DirEnum::SECTIONS, - 'networking_typeTxt' => DirEnum::NETWORKS, - 'city' => DirEnum::LOCALITIES, - 'countryTxt' => DirEnum::COUNTRIES, - 'entreprise' => DirEnum::COMPANIES, - 'jobtermTxt' => DirEnum::JOBTERMS, - 'description' => DirEnum::JOBDESCRIPTION, - 'nationaliteTxt' => DirEnum::NATIONALITIES, - 'schoolTxt' => DirEnum::EDUSCHOOLS, - ); - if (!array_key_exists($type, $enums)) { + Get::t('term')); + if (!$q) { exit(); } + if (!is_null($sub_id)) { + $query = $q . "\t" . $sub_id; + } else { + $query = $q; + } - $enum = $enums[$type]; + // Try to look in cached results. + $cached = false; + $cache = XDB::query('SELECT result + FROM search_autocomplete + WHERE name = {?} AND query = {?} AND generated > NOW() - INTERVAL 1 DAY', + $type, $query); + + if ($cache->numRows() > 0) { + $cached = true; + $data = explode("\n", $cache->fetchOneCell()); + $list = array(); + foreach ($data as $line) { + if ($line != '') { + $aux = explode("\t", $line); + $item = array( + 'field' => $aux[0], + 'nb' => $aux[1], + 'id' => $aux[2] + ); + $item['value'] = self::format_autocomplete($item); + array_push($list, $item); + } + } + } else { + $enums = array( + 'binet_text' => DirEnum::BINETS, + 'groupex_text' => DirEnum::GROUPESX, + 'section_text' => DirEnum::SECTIONS, + 'networking_type_text' => DirEnum::NETWORKS, + 'locality_text' => DirEnum::LOCALITIES, + 'country_text' => DirEnum::COUNTRIES, + 'entreprise' => DirEnum::COMPANIES, + 'jobterm_text' => DirEnum::JOBTERMS, + 'description' => DirEnum::JOBDESCRIPTION, + 'nationalite_text' => DirEnum::NATIONALITIES, + 'school_text' => DirEnum::EDUSCHOOLS, + ); + if (!array_key_exists($type, $enums)) { + exit(); + } - $list = DirEnum::getAutoComplete($enum, $q); - $nbResults = 0; - $res = ""; - while ($result = $list->next()) { - $nbResults++; - if ($nbResults == 11) { - $res .= $q."|-1\n"; + if (is_null($sub_id)) { + $list = DirEnum::getAutoComplete($enums[$type], $q); } else { - $res .= $result['field'].'|'; - if (isset($result['nb'])) { - $res .= $result['nb']; - } - if (isset($result['id'])) { - $res .= '|'.$result['id']; - } - $res .= "\n"; + $list = DirEnum::getAutoComplete($enums[$type], $q, $sub_id); + } + $to_cache = ''; + foreach ($list as &$item) { + $to_cache .= $item['field'] . "\t" . $item['nb'] . "\t" . $item['id'] . "\n"; + $item['value'] = self::format_autocomplete($item); } } - if ($nbResults == 0) { - $res = $q."|-2\n"; + + $count = count($list); + if ($count == DirEnumeration::AUTOCOMPLETE_LIMIT) { + $list[] = array( + 'value' => '…', + 'field' => '', + 'nb' => 0, + 'id' => -1 + ); + } elseif ($count == 0) { + $list[] = array( + 'value' => 'Aucun camarade trouvé pour ' . $q . '.', + 'field' => '', + 'nb' => 0, + 'id' => -1 + ); + } + + if (!$cached) { + XDB::query('INSERT INTO search_autocomplete (name, query, result, generated) + VALUES ({?}, {?}, {?}, NOW()) + ON DUPLICATE KEY UPDATE result = VALUES(result), generated = VALUES(generated)', + $type, $query, $to_cache); } - XDB::query('INSERT INTO search_autocomplete (name, query, result, generated) - VALUES ({?}, {?}, {?}, NOW()) - ON DUPLICATE KEY UPDATE result = VALUES(result), generated = VALUES(generated)', - $type, $q, $res); - echo $res; + echo json_encode($list); exit(); } - function handler_list(&$page, $type = null, $idVal = null) + function handler_list($page, $type = null, $idVal = null) { $page->assign('name', $type); $page->assign('with_text_value', true); @@ -298,7 +341,22 @@ class SearchModule extends PLModule break; case 'country': $ids = DirEnum::getOptionsIter(DirEnum::COUNTRIES); - $page->assign('onchange', 'changeCountry(this.value)'); + $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)'); + break; + case 'administrative_area_level_1': + case 'administrative_area_level_2': + case 'locality': + $page->assign('onchange', 'changeAddressComponents(\'' . $type . '\', this.value)'); + case 'postal_code': + $ids = XDB::iterator("SELECT pace1.id, pace1.long_name AS field + FROM profile_addresses_components_enum AS pace1 + INNER JOIN profile_addresses_components AS pac1 ON (pac1.component_id = pace1.id) + INNER JOIN profile_addresses_components AS pac2 ON (pac1.pid = pac2.pid AND pac1.jobid = pac2.jobid AND pac1.id = pac2.id + AND pac1.groupid = pac2.groupid AND pac1.type = pac2.type) + INNER JOIN profile_addresses_components_enum AS pace2 ON (pac2.component_id = pace2.id AND FIND_IN_SET({?}, pace2.types)) + WHERE pace2.id = {?} AND FIND_IN_SET({?}, pace1.types) AND pac1.type = 'home' + GROUP BY pace1.long_name", + Env::v('previous'), Env::v('value'), $type); break; case 'diploma': if (Env::has('school') && Env::i('school') != 0) { @@ -313,13 +371,6 @@ class SearchModule extends PLModule case 'nationalite': $ids = DirEnum::getOptionsIter(DirEnum::NATIONALITIES); break; - case 'region': - if (Env::has('country')) { - $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS, Env::v('country')); - } else { - $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS); - } - break; case 'school': $ids = DirEnum::getOptionsIter(DirEnum::EDUSCHOOLS); $page->assign('onchange', 'changeSchool(this.value)'); @@ -329,7 +380,7 @@ class SearchModule extends PLModule break; case 'jobterm': if (Env::has('jtid')) { - JobTerms::ajaxGetBranch(&$page, JobTerms::ONLY_JOBS); + JobTerms::ajaxGetBranch($page, JobTerms::ONLY_JOBS); return; } else { pl_content_headers('text/xml'); @@ -355,7 +406,7 @@ class SearchModule extends PLModule $page->assign('list', $ids); } - function handler_referent(&$page, $action = null, $subaction = null) + function handler_referent($page, $action = null, $subaction = null) { global $globals; @@ -363,17 +414,22 @@ class SearchModule extends PLModule $wp->buildCache(); $page->setTitle('Emploi et Carrières'); + $page->addJsLink('jquery.ui.xorg.js'); // 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()) { + + // Search query is logged + if (S::logged() && !Env::has('page')) { + S::logger()->log('search_referent', 'adv=' . var_export($_GET, true)); + } + require_once 'userset.inc.php'; $ufc = $ufb->getUFC(); $set = new ProfileSet($ufc); @@ -398,7 +454,7 @@ class SearchModule extends PLModule * 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) + function handler_referent_countries($page, $jtid = null) { pl_content_headers("text/xml"); $page->changeTpl('include/field.select.tpl', NO_SKIN); @@ -409,11 +465,11 @@ class SearchModule extends PLModule 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 country", $jtid); + GROUP BY gc.iso_3166_1_a2 + ORDER BY gc.country", $jtid); $page->assign('list', $it); } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>