X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=e3bfee7015a19e5d06cb4c614fc035c4b75e9df8;hb=96b778a679b261235ede8c5c4e7356680f4e5895;hp=d3c91643bab2011cba59f5b16fe903ec1d008fd3;hpb=e76e94fb790c73146110b395342eb188605ed985;p=platal.git diff --git a/modules/search.php b/modules/search.php index d3c9164..e3bfee7 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ $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), - '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), + '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'), ); } @@ -121,9 +121,9 @@ class SearchModule extends PLModule require_once 'userset.inc.php'; $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)); - $view->addMod('map', 'Planisphère'); } $view->apply('search', $page, $model); @@ -149,6 +149,7 @@ class SearchModule extends PLModule function handler_advanced($page, $model = null, $byletter = null) { global $globals; + $page->addJsLink('jquery.ui.xorg.js'); $page->addJsLink('search.js'); $page->assign('advanced',1); @@ -157,8 +158,8 @@ class SearchModule extends PLModule $networks[0] = '-'; ksort($networks); $page->assign('networking_types', $networks); - $origin_corps_list = DirEnum::getOptions(DirEnum::CURRENTCORPS); - $current_corps_list = DirEnum::getOptions(DirEnum::ORIGINCORPS); + $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] = '-'; @@ -212,7 +213,12 @@ class SearchModule extends PLModule $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. @@ -227,66 +233,93 @@ 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( - '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)) { + 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(); } @@ -381,6 +414,7 @@ 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"); @@ -390,6 +424,12 @@ class SearchModule extends PLModule 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); @@ -431,5 +471,5 @@ class SearchModule extends PLModule } } -// 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: ?>