X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=74d785fbc75bd1f462eeb143492490accfb2dba5;hb=61e0e8619a9e391d9536d1af3c8cd441491bbc99;hp=74228be0e0f4e38eafe991c1c911ef07529b3c1a;hpb=07c4f9cc45def470f31b966ede4e5c38bb045f65;p=platal.git diff --git a/modules/search.php b/modules/search.php index 74228be..74d785f 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ assign('promo_max', $max); if (Env::has('quick') || $action == 'geoloc') { + $quick = trim(Env::v('quick')); + if (S::logged() && !Env::has('page')) { + $_SESSION['log']->log('search', 'quick=' . $quick); + } + $list = 'profile|prf|fiche|fic|referent|ref|mentor'; + if (S::has_perms()) { + $list .= '|admin|adm|ax'; + } + if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', replace_accent($quick), $matches)) { + $forlife = $matches[2]; + switch($matches[1]) { + case 'admin': case 'adm': + $base = 'admin/user/'; + break; + case 'ax': + $base = 'profile/ax/'; + break; + case 'profile': case 'prf': case 'fiche': case 'fic': + $base = 'profile/'; + break; + case 'referent': case 'ref': case 'mentor': + $base = 'referent/'; + break; + } + + require_once 'user.func.inc.php'; + $login = get_user_forlife($forlife, '_silent_user_callback'); + if ($login) { + pl_redirect($base . $login); + } + $_REQUEST['quick'] = $forlife; + $_GET['quick'] = $forlife; + } elseif (strpos($quick, 'doc:') === 0) { + $url = 'Docs/Recherche?'; + $url .= 'action=search&q=' . urlencode(substr($quick, 4)); + $url .= '&group=' . urlencode('-Equipe,-Main,-PmWiki,-Site,-Review'); + pl_redirect($url); + } + $page->assign('formulaire', 0); require_once 'userset.inc.php'; @@ -95,20 +134,21 @@ class SearchModule extends PLModule $view->addMod('minifiche', 'Minifiches', true, array('with_score' => true)); if (S::logged() && !Env::i('nonins')) { $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true, 'with_score' => true)); - $view->addMod('geoloc', 'Planisphère'); + $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); } $view->apply('search', $page, $action, $subaction); $nb_tot = $view->count(); + $page->assign('search_results_nb', $nb_tot); if ($subaction) { return; } if (!S::logged() && $nb_tot > $globals->search->public_max) { new ThrowError('Votre recherche a généré trop de résultats pour un affichage public.'); } elseif ($nb_tot > $globals->search->private_max) { - new ThrowError('Recherche trop générale'); + new ThrowError('Recherche trop générale. Une recherche avancée permet de préciser la recherche.'); } elseif (empty($nb_tot)) { - new ThrowError('il n\'existe personne correspondant à ces critères dans la base !'); + new ThrowError('Il n\'existe personne correspondant à ces critères dans la base !'); } } else { $page->assign('formulaire',1); @@ -116,7 +156,7 @@ class SearchModule extends PLModule } require_once dirname(__FILE__) . '/search/search.inc.php'; - $page->changeTpl('search/index.tpl'); + $page->changeTpl('search/index.tpl'); $page->assign('xorg_title','Polytechnique.org - Annuaire'); } @@ -130,20 +170,47 @@ class SearchModule extends PLModule if (!Env::has('rechercher') && $action != 'geoloc') { $this->form_prepare(); } else { + $textFields = array( + 'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false), + 'fonction' => array('field' => 'id', 'table' => 'fonctions_def', 'text' => 'fonction_fr', 'exact' => true), + 'secteur' => array('field' => 'id', 'table' => 'emploi_secteur', 'text' => 'label', 'exact' => false), + 'nationalite' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'nat', 'exact' => 'false'), + 'binet' => array('field' => 'id', 'table' => 'binets_def', 'text' => 'text', 'exact' => false), + 'groupex' => array('field' => 'id', 'table' => 'groupex.asso', + 'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom", + 'exact' => false), + 'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false), + 'school' => array('field' => 'id', 'table' => 'applis_def', 'text' => 'text', 'exact' => false), + 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false) + ); + if (!Env::has('page')) { + $_SESSION['log']->log('search', 'adv=' . var_export($_GET, true)); + } + foreach ($textFields as $field=>&$query) { + if (!Env::v($field) && Env::v($field . 'Txt')) { + $res = XDB::query("SELECT {$query['field']} + FROM {$query['table']} + WHERE {$query['text']} " . ($query['exact'] ? " = {?}" : + " LIKE CONCAT('%', {?}, '%')"), + Env::v($field . 'Txt')); + $_REQUEST[$field] = $res->fetchOneCell(); + } + } + require_once 'userset.inc.php'; $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf'); $view->addMod('minifiche', 'Minifiches', true); $view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true)); - $view->addMod('geoloc', 'Planishpère'); + //$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) { $this->form_prepare(); - new ThrowError('Recherche trop générale'); + new ThrowError('Recherche trop générale.'); } } @@ -170,7 +237,7 @@ class SearchModule extends PLModule $_REQUEST['q']); if (!$q) exit(); - // try to look in cached results + // try to look in cached results $cache = XDB::query('SELECT `result` FROM `search_autocomplete` WHERE `name` = {?} AND @@ -181,16 +248,15 @@ class SearchModule extends PLModule echo $res; die(); } - + // default search - $q = preg_quote($q); $unique = '`user_id`'; $db = '`auth_user_md5`'; $realid = false; $beginwith = true; $field2 = false; - $qsearch = $q; - + $qsearch = str_replace(array('%', '_'), '', $q); + switch ($type) { case 'binetTxt': $db = '`binets_def` INNER JOIN @@ -221,7 +287,6 @@ class SearchModule extends PLModule break; case 'firstname': $field = '`prenom`'; - $q = '(^|[ \\-])'.$q; $beginwith = false; break; case 'fonctionTxt': @@ -230,22 +295,23 @@ class SearchModule extends PLModule $field = '`fonction_fr`'; $unique = '`uid`'; $realid = '`fonctions_def`.`id`'; - $qsearch = '(^|[ /\\-])'.$q; $beginwith = false; break; case 'groupexTxt': - $db = '`groupesx_def` INNER JOIN - `groupesx_ins` ON(`groupesx_def`.`id` = `groupesx_ins`.`gid`)'; - $field='`groupesx_def`.`text`'; + $db = "groupex.asso AS a INNER JOIN + groupex.membres AS m ON(a.id = m.asso_id + AND (a.cat = 'GroupesX' OR a.cat = 'Institutions') + AND a.pub = 'public')"; + $field='a.nom'; + $field2 = 'a.diminutif'; if (strlen($q) > 2) $beginwith = false; - $realid = '`groupesx_def`.`id`'; - $unique = '`guid`'; + $realid = 'a.id'; + $unique = 'm.uid'; break; case 'name': $field = '`nom`'; $field2 = '`nom_usage`'; - $qsearch = '(^|[ \\-])'.$q; $beginwith = false; break; case 'nationaliteTxt': @@ -259,7 +325,6 @@ class SearchModule extends PLModule case 'nickname': $field = '`profile_nick`'; $db = '`auth_user_quick`'; - $qsearch = '(^|[ \\-])'.$q; $beginwith = false; break; case 'poste': @@ -285,7 +350,7 @@ class SearchModule extends PLModule $beginwith = false; break; case 'sectionTxt': - $db = '`sections` INNER JOIN + $db = '`sections` INNER JOIN `auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)'; $field = '`sections`.`text`'; $realid = '`sections`.`id`'; @@ -294,30 +359,38 @@ class SearchModule extends PLModule default: exit(); } + function make_field_test($fields, $beginwith) { + $tests = array(); + $tests[] = $fields . ' LIKE CONCAT({?}, \'%\')'; + if (!$beginwith) { + $tests[] = $fields . ' LIKE CONCAT(\'% \', {?}, \'%\')'; + $tests[] = $fields . ' LIKE CONCAT(\'%-\', {?}, \'%\')'; + } + return '(' . implode(' OR ', $tests) . ')'; + } $field_select = $field; + $field_t = make_field_test($field, $beginwith); if ($field2) { - $field_select = 'IF('.$field.' REGEXP {?}, '.$field.', '.$field2.')'; - } - - if ($beginwith) { - $qsearch = '^'.$qsearch; + $field2_t = make_field_test($field2, $beginwith); + $field_select = 'IF(' . $field_t . ', ' . $field . ', ' . $field2. ')'; } - $list = XDB::iterator('SELECT '.$field_select.' AS field, - COUNT(DISTINCT '.$unique.') AS nb - '.($realid?(', '.$realid.' AS id'):'').' - FROM '.$db.' - WHERE '.$field.' REGEXP {?}'. - ($field2?(' OR '.$field2.' REGEXP {?}'):'').' - GROUP BY '.$field_select.' + $list = XDB::iterator('SELECT ' . $field_select . ' AS field, + COUNT(DISTINCT ' . $unique . ') AS nb + ' . ($realid ? (', ' . $realid . ' AS id') : '') . ' + FROM ' . $db . ' + WHERE ' . $field_t . + ($field2 ? (' OR ' . $field2_t) : '') . ' + GROUP BY ' . $field_select . ' ORDER BY nb DESC LIMIT 11', - $qsearch, $qsearch, $qsearch, $qsearch); + $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, + $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch); $nbResults = 0; $res = ""; while ($result = $list->next()) { $nbResults++; if ($nbResults == 11) { - $res .= '...|1'."\n"; + $res .= $q."|-1\n"; } else { $res .= $result['field'].'|'; $res .= $result['nb']; @@ -333,7 +406,7 @@ class SearchModule extends PLModule echo $res; exit(); } - + function handler_list(&$page, $type = null, $idVal = null) { // Give the list of all values possible of type and builds a select input for it @@ -361,10 +434,12 @@ class SearchModule extends PLModule $page->changeTpl('search/adv.grade.form.tpl', NO_SKIN); return; case 'groupex': - $db = '`groupesx_def`'; + $db = 'groupex.asso'; + $where = " WHERE (cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public'"; + $field = 'nom'; break; case 'nationalite': - $db = '`geoloc_pays` INNER JOIN + $db = '`geoloc_pays` INNER JOIN `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)'; $field = 'IF(`nat`=\'\', `pays`, `nat`)'; $id = '`a2`'; @@ -372,7 +447,7 @@ class SearchModule extends PLModule case 'region': $db = '`geoloc_region`'; $field = '`name`'; - $id = '`region`'; + $id = '`region`'; if (isset($_REQUEST['country'])) { $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"'; } @@ -404,6 +479,8 @@ class SearchModule extends PLModule FROM '.$db.$where.' GROUP BY '.$field.' ORDER BY '.$field)); + $page->assign('with_text_value', true); + $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text"); } }