X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=1a98912f25f9c432ea93367a618ead5a87e4d232;hb=032b244ed3fd10b934697f2636fc9a4574822408;hp=46c7850676de8e42ec8804b37b4d7aa133cfbb61;hpb=e35882beae6b03f138e68d7bcf5e943bff1f4d52;p=platal.git diff --git a/modules/search.php b/modules/search.php index 46c7850..1a98912 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ 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})?)?)$/', $quick, $matches)) { + 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': @@ -109,11 +112,18 @@ class SearchModule extends PLModule $base = 'referent/'; break; } - pl_redirect($base . $forlife); + + 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'); + $url .= '&group=' . urlencode('-Equipe,-Main,-PmWiki,-Site,-Review'); pl_redirect($url); } @@ -136,9 +146,9 @@ class SearchModule extends PLModule 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); @@ -156,15 +166,43 @@ class SearchModule extends PLModule require_once 'geoloc.inc.php'; require_once dirname(__FILE__) . '/search/search.inc.php'; $page->assign('advanced',1); + $page->addJsLink('jquery.autocomplete.js'); 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', 'Planisphère', false, array('with_annu' => 'search/adv')); + //$view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv')); $view->apply('search/adv', $page, $action, $subaction); if ($subaction) { @@ -173,7 +211,7 @@ class SearchModule extends PLModule $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.'); } } @@ -213,13 +251,12 @@ class SearchModule extends PLModule } // 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': @@ -251,7 +288,6 @@ class SearchModule extends PLModule break; case 'firstname': $field = '`prenom`'; - $q = '(^|[ \\-])'.$q; $beginwith = false; break; case 'fonctionTxt': @@ -260,22 +296,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': @@ -289,7 +326,6 @@ class SearchModule extends PLModule case 'nickname': $field = '`profile_nick`'; $db = '`auth_user_quick`'; - $qsearch = '(^|[ \\-])'.$q; $beginwith = false; break; case 'poste': @@ -324,30 +360,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']; @@ -391,7 +435,9 @@ 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 @@ -434,6 +480,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"); } }