X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=97f87730f86112af1216beda2d184e1c08ef41b6;hb=eeb2ec0f85030e4890868d034ef6ff60ed94ea7d;hp=0413ae2634c8792ced0911a24f79373f6dcc8d3a;hpb=f08062c34562e0618993106f2a63fb2117be6943;p=platal.git diff --git a/modules/search.php b/modules/search.php index 0413ae2..97f8773 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'; @@ -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,6 +166,7 @@ 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(); @@ -166,6 +177,8 @@ class SearchModule extends PLModule '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), + 'networking_type' => array('field' => 'network_type', 'table' => 'profile_networking_enum', + 'text' => 'name', 'exact' => false), 'groupex' => array('field' => 'id', 'table' => 'groupex.asso', 'text' => "(a.cat = 'GroupesX' OR a.cat = 'Institutions') AND pub = 'public' AND nom", 'exact' => false), @@ -173,6 +186,9 @@ class SearchModule extends PLModule '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']} @@ -188,7 +204,7 @@ class SearchModule extends PLModule $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) { @@ -197,7 +213,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.'); } } @@ -237,13 +253,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': @@ -254,6 +269,13 @@ class SearchModule extends PLModule $beginwith = false; $realid = '`binets_def`.`id`'; break; + case 'networking_typeTxt': + $db = '`profile_networking_enum` INNER JOIN + `profile_networking` ON(`profile_networking`.`network_type` = `profile_networking_enum`.`network_type`)'; + $field = '`profile_networking_enum`.`name`'; + $unique = 'uid'; + $realid = '`profile_networking_enum`.`network_type`'; + break; case 'city': $db = '`geoloc_city` INNER JOIN `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)'; @@ -275,7 +297,6 @@ class SearchModule extends PLModule break; case 'firstname': $field = '`prenom`'; - $q = '(^|[ \\-])'.$q; $beginwith = false; break; case 'fonctionTxt': @@ -284,7 +305,6 @@ class SearchModule extends PLModule $field = '`fonction_fr`'; $unique = '`uid`'; $realid = '`fonctions_def`.`id`'; - $qsearch = '(^|[ /\\-])'.$q; $beginwith = false; break; case 'groupexTxt': @@ -302,7 +322,6 @@ class SearchModule extends PLModule case 'name': $field = '`nom`'; $field2 = '`nom_usage`'; - $qsearch = '(^|[ \\-])'.$q; $beginwith = false; break; case 'nationaliteTxt': @@ -316,7 +335,6 @@ class SearchModule extends PLModule case 'nickname': $field = '`profile_nick`'; $db = '`auth_user_quick`'; - $qsearch = '(^|[ \\-])'.$q; $beginwith = false; break; case 'poste': @@ -351,30 +369,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']; @@ -402,6 +428,11 @@ class SearchModule extends PLModule case 'binet': $db = '`binets_def`'; break; + case 'networking_type': + $db = '`profile_networking_enum`'; + $field = '`name`'; + $id = '`network_type`'; + break; case 'country': $db = '`geoloc_pays`'; $field = '`pays`';