X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=1de908cef5594f153d76ee8f31da89e173969812;hb=2398e5532a43f94757c41054ded46142541c41ee;hp=8fb9adf34304ea7fb588109746d200d21727ea20;hpb=baa62e58cdfb6839040e156ef91e2827bdde1600;p=platal.git diff --git a/modules/search.php b/modules/search.php index 8fb9adf..1de908c 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ assign('formulaire',1); + Platal::page()->assign('formulaire',1); } function get_diplomas($school = null) @@ -58,22 +56,24 @@ class SearchModule extends PLModule $school = Env::i('school'); } - if (!is_null($school)) { - $sql = 'SELECT type FROM applis_def WHERE id=' . $school; + if ((!is_null($school)) && ($school != '')) { + $sql = 'SELECT degreeid + FROM profile_education_degree + WHERE eduid=' . $school; } else { - $sql = 'DESCRIBE applis_def type'; + $sql = 'SELECT id + FROM profile_education_degree_enum + ORDER BY id'; } $res = XDB::query($sql); - $row = $res->fetchOneRow(); - if (!is_null($school)) { - $types = $row[0]; - } else { - $types = explode('(',$row[1]); - $types = str_replace("'","",substr($types[1],0,-1)); - } - global $page; - $page->assign('choix_diplomas', explode(',',$types)); + Platal::page()->assign('choix_diplomas', $res->fetchColumn()); + + $sql = 'SELECT degree + FROM profile_education_degree_enum + ORDER BY id'; + $res = XDB::query($sql); + Platal::page()->assign('name_diplomas', $res->fetchColumn()); } function handler_quick(&$page, $action = null, $subaction = null) @@ -89,6 +89,9 @@ class SearchModule extends PLModule if (Env::has('quick') || $action == 'geoloc') { $quick = trim(Env::v('quick')); + if (S::logged() && !Env::has('page')) { + S::logger()->log('search', 'quick=' . $quick); + } $list = 'profile|prf|fiche|fic|referent|ref|mentor'; if (S::has_perms()) { $list .= '|admin|adm|ax'; @@ -128,7 +131,7 @@ class SearchModule extends PLModule require_once 'userset.inc.php'; $view = new SearchSet(true, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Minifiches', true, array('with_score' => true)); + $view->addMod('minifiche', 'Mini-fiches', 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', false, array('with_annu' => 'search/adv')); @@ -143,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); @@ -154,7 +157,7 @@ class SearchModule extends PLModule require_once dirname(__FILE__) . '/search/search.inc.php'; $page->changeTpl('search/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Annuaire'); + $page->setTitle('Annuaire'); } function handler_advanced(&$page, $action = null, $subaction = null) @@ -163,23 +166,29 @@ 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) + '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), + '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), + 'section' => array('field' => 'id', 'table' => 'sections', 'text' => 'text', 'exact' => false), + 'school' => array('field' => 'id', 'table' => 'profile_education_enum', 'text' => 'name', 'exact' => false), + 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false) ); + if (!Env::has('page')) { + S::logger()->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']} @@ -193,9 +202,9 @@ class SearchModule extends PLModule require_once 'userset.inc.php'; $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf'); - $view->addMod('minifiche', 'Minifiches', true); + $view->addMod('minifiche', 'Mini-fiches', 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) { @@ -204,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.'); } } @@ -255,11 +264,18 @@ class SearchModule extends PLModule case 'binetTxt': $db = '`binets_def` INNER JOIN `binets_ins` ON(`binets_def`.`id` = `binets_ins`.`binet_id`)'; - $field='`binets_def`.`text`'; + $field = '`binets_def`.`text`'; if (strlen($q) > 2) $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`)'; @@ -269,15 +285,15 @@ class SearchModule extends PLModule case 'countryTxt': $db = '`geoloc_pays` INNER JOIN `adresses` ON(`geoloc_pays`.`a2` = `adresses`.`country`)'; - $unique='`uid`'; + $unique = '`uid`'; $field = '`geoloc_pays`.`pays`'; $field2 = '`geoloc_pays`.`country`'; - $realid='`geoloc_pays`.`a2`'; + $realid = '`geoloc_pays`.`a2`'; break; case 'entreprise': $db = '`entreprises`'; $field = '`entreprise`'; - $unique='`uid`'; + $unique = '`uid`'; break; case 'firstname': $field = '`prenom`'; @@ -310,7 +326,9 @@ class SearchModule extends PLModule break; case 'nationaliteTxt': $db = '`geoloc_pays` INNER JOIN - `auth_user_md5` ON(`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)'; + `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite` OR + `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite2` OR + `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite3`)'; $field = 'IF(`geoloc_pays`.`nat`=\'\', `geoloc_pays`.`pays`, `geoloc_pays`.`nat`)'; @@ -324,14 +342,14 @@ class SearchModule extends PLModule case 'poste': $db = '`entreprises`'; $field = '`poste`'; - $unique='`uid`'; + $unique = '`uid`'; break; case 'schoolTxt': - $db = '`applis_def` INNER JOIN - `applis_ins` ON(`applis_def`.`id` = `applis_ins`.`aid`)'; - $field='`applis_def`.`text`'; - $unique = '`uid`'; - $realid = '`applis_def`.`id`'; + $db = 'profile_education_enum INNER JOIN + profile_education ON (profile_education_enum.id = profile_education.eduid)'; + $field = 'profile_education_enum.name'; + $unique = 'uid'; + $realid = 'profile_education_enum.id'; if (strlen($q) > 2) $beginwith = false; break; @@ -377,13 +395,15 @@ class SearchModule extends PLModule 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); + $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']; @@ -411,6 +431,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`'; @@ -433,7 +458,9 @@ class SearchModule extends PLModule break; case 'nationalite': $db = '`geoloc_pays` INNER JOIN - `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)'; + `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite` OR + `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite2` OR + `geoloc_pays`.`a2` = `auth_user_md5`.`nationalite3`)'; $field = 'IF(`nat`=\'\', `pays`, `nat`)'; $id = '`a2`'; break; @@ -446,7 +473,9 @@ class SearchModule extends PLModule } break; case 'school': - $db = '`applis_def`'; + $db = 'profile_education_enum'; + $field = 'name'; + $id = 'id'; $page->assign('onchange', 'changeSchool(this.value)'); break; case 'section':