X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=6629cc251685aff3a6c6d81d234fd2b5f8132e8b;hb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;hp=dba45b3adda42c9123894357be58ddbcd1731a30;hpb=a959b199b8f4790bf311c4e9c4b96b4ffb494eeb;p=platal.git
diff --git a/modules/search.php b/modules/search.php
index dba45b3..6629cc2 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -43,35 +43,12 @@ class SearchModule extends PLModule
Platal::page()->assign('formulaire',1);
}
- function get_diplomas($school = null)
- {
- if (is_null($school) && Env::has('school')) {
- $school = Env::i('school');
- }
-
- if (!is_null($school)) {
- $sql = 'SELECT type FROM applis_def WHERE id=' . $school;
- } else {
- $sql = 'DESCRIBE applis_def type';
- }
-
- $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));
- }
- Platal::page()->assign('choix_diplomas', explode(',',$types));
- }
-
function handler_quick(&$page, $action = null, $subaction = null)
{
global $globals;
$res = XDB::query("SELECT MIN(diminutif), MAX(diminutif)
- FROM #groupex#.asso
+ FROM groups
WHERE cat = 'Promotions'");
list($min, $max) = $res->fetchOneRow();
$page->assign('promo_min', $min);
@@ -123,7 +100,8 @@ class SearchModule extends PLModule
$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'));
+ // TODO: Reactivate when the new map is completed.
+ // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
}
$view->apply('search', $page, $action, $subaction);
@@ -133,11 +111,11 @@ class SearchModule extends PLModule
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.');
+ $page->trigError('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. Une recherche avancée permet de préciser la recherche.');
+ $page->trigError('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 !');
+ $page->trigError('Il n\'existe personne correspondant à ces critères dans la base !');
}
} else {
$page->assign('formulaire',1);
@@ -152,7 +130,7 @@ class SearchModule extends PLModule
function handler_advanced(&$page, $action = null, $subaction = null)
{
global $globals;
- require_once 'geoloc.inc.php';
+ require_once 'geocoding.inc.php';
$this->load('search.inc.php');
$page->assign('advanced',1);
$page->addJsLink('jquery.autocomplete.js');
@@ -160,38 +138,16 @@ 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' => "(cat = 'GroupesX' OR 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')) {
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']}
- 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', 'Mini-fiches', true);
$view->addMod('trombi', 'Trombinoscope', false, array('with_promo' => true));
- //$view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
+ // TODO: Reactivate when the new map is completed.
+ // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'search/adv'));
$view->apply('search/adv', $page, $action, $subaction);
if ($subaction) {
@@ -200,7 +156,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.');
+ $page->trigError('Recherche trop générale.');
}
}
@@ -224,157 +180,42 @@ class SearchModule extends PLModule
array('',
'\\\\\1',
'.*'),
- $_REQUEST['q']);
+ 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',
+ $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();
}
- // default search
- $unique = '`user_id`';
- $db = '`auth_user_md5`';
- $realid = false;
- $beginwith = true;
- $field2 = false;
- $qsearch = str_replace(array('%', '_'), '', $q);
-
- switch ($type) {
- case 'binetTxt':
- $db = '`binets_def` INNER JOIN
- `binets_ins` ON(`binets_def`.`id` = `binets_ins`.`binet_id`)';
- $field='`binets_def`.`text`';
- if (strlen($q) > 2)
- $beginwith = false;
- $realid = '`binets_def`.`id`';
- break;
- case 'city':
- $db = '`geoloc_city` INNER JOIN
- `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)';
- $unique='`uid`';
- $field='`geoloc_city`.`name`';
- break;
- case 'countryTxt':
- $db = '`geoloc_pays` INNER JOIN
- `adresses` ON(`geoloc_pays`.`a2` = `adresses`.`country`)';
- $unique='`uid`';
- $field = '`geoloc_pays`.`pays`';
- $field2 = '`geoloc_pays`.`country`';
- $realid='`geoloc_pays`.`a2`';
- break;
- case 'entreprise':
- $db = '`entreprises`';
- $field = '`entreprise`';
- $unique='`uid`';
- break;
- case 'firstname':
- $field = '`prenom`';
- $beginwith = false;
- break;
- case 'fonctionTxt':
- $db = '`fonctions_def` INNER JOIN
- `entreprises` ON(`entreprises`.`fonction` = `fonctions_def`.`id`)';
- $field = '`fonction_fr`';
- $unique = '`uid`';
- $realid = '`fonctions_def`.`id`';
- $beginwith = false;
- break;
- case 'groupexTxt':
- $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 = 'a.id';
- $unique = 'm.uid';
- break;
- case 'name':
- $field = '`nom`';
- $field2 = '`nom_usage`';
- $beginwith = false;
- break;
- case 'nationaliteTxt':
- $db = '`geoloc_pays` INNER JOIN
- `auth_user_md5` ON(`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
- $field = 'IF(`geoloc_pays`.`nat`=\'\',
- `geoloc_pays`.`pays`,
- `geoloc_pays`.`nat`)';
- $realid = '`geoloc_pays`.`a2`';
- break;
- case 'nickname':
- $field = '`profile_nick`';
- $db = '`auth_user_quick`';
- $beginwith = false;
- break;
- case 'poste':
- $db = '`entreprises`';
- $field = '`poste`';
- $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`';
- if (strlen($q) > 2)
- $beginwith = false;
- break;
- case 'secteurTxt':
- $db = '`emploi_secteur` INNER JOIN
- `entreprises` ON(`entreprises`.`secteur` = `emploi_secteur`.`id`)';
- $field = '`emploi_secteur`.`label`';
- $realid = '`emploi_secteur`.`id`';
- $unique = '`uid`';
- $beginwith = false;
- break;
- case 'sectionTxt':
- $db = '`sections` INNER JOIN
- `auth_user_md5` ON(`auth_user_md5`.`section` = `sections`.`id`)';
- $field = '`sections`.`text`';
- $realid = '`sections`.`id`';
- $beginwith = false;
- break;
- default: exit();
+ require_once 'directory.enums.inc.php';
+ $enums = array(
+ 'binetTxt' => DirEnum::BINETS,
+ 'groupexTxt' => DirEnum::GROUPESX,
+ 'sectionTxt' => DirEnum::SECTIONS,
+ 'networking_typeTxt' => DirEnum::NETWORKS,
+ 'city' => DirEnum::LOCALITIES,
+ 'countryTxt' => DirEnum::COUNTRIES,
+ 'entreprise' => DirEnum::COMPANIES,
+ 'secteurTxt' => DirEnum::SECTORS,
+ 'description' => DirEnum::JOBDESCRIPTION,
+ 'nationaliteTxt' => DirEnum::NATIONALITIES,
+ 'schoolTxt' => DirEnum::EDUSCHOOLS,
+ );
+ if (!array_key_exists($enums, $type)) {
+ 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) {
- $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_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);
+ $enum = $enums[$type];
+
+ $list = DirEnum::getAutoComplete($enum, $q);
$nbResults = 0;
$res = "";
while ($result = $list->next()) {
@@ -383,14 +224,16 @@ class SearchModule extends PLModule
$res .= $q."|-1\n";
} else {
$res .= $result['field'].'|';
- $res .= $result['nb'];
+ if (isset($result['nb'])) {
+ $res .= $result['nb'];
+ }
if (isset($result['id'])) {
$res .= '|'.$result['id'];
}
$res .= "\n";
}
}
- XDB::query('REPLACE INTO `search_autocomplete`
+ XDB::query('REPLACE INTO search_autocomplete
VALUES ({?}, {?}, {?}, NOW())',
$type, $q, $res);
echo $res;
@@ -400,75 +243,61 @@ class SearchModule extends PLModule
function handler_list(&$page, $type = null, $idVal = null)
{
// Give the list of all values possible of type and builds a select input for it
- $field = '`text`';
- $id = '`id`';
- $where = '';
+ $ids = null;
+ require_once 'directory.enums.inc.php';
switch ($type) {
- case 'binet':
- $db = '`binets_def`';
+ case 'binet':
+ $ids = DirEnum::getOptions(DirEnum::BINETS);
+ break;
+ case 'networking_type':
+ $ids = DirEnum::getOptions(DirEnum::NETWORKS);
break;
case 'country':
- $db = '`geoloc_pays`';
- $field = '`pays`';
- $id = '`a2`';
+ $ids = DirEnum::getOptions(DirEnum::COUNTRIES);
$page->assign('onchange', 'changeCountry(this.value)');
break;
- case 'fonction':
- $db = '`fonctions_def`';
- $field = '`fonction_fr`';
- break;
case 'diploma':
- pl_content_headers("text/xml");
- $this->get_diplomas();
- $page->changeTpl('search/adv.grade.form.tpl', NO_SKIN);
- return;
+ if (Env::has('school') && Env::i('school') != 0) {
+ $ids = DirEnum::getOptions(DirEnum::EDUDEGREES, Env::i('school'));
+ } else {
+ $ids = DirEnum::getOptions(DirEnum::EDUDEGREES);
+ }
+ break;
case 'groupex':
- $db = '#groupex#.asso';
- $where = " WHERE (cat = 'GroupesX' OR cat = 'Institutions') AND pub = 'public'";
- $field = 'nom';
+ $ids = DirEnum::getOptions(DirEnum::GROUPESX);
break;
case 'nationalite':
- $db = '`geoloc_pays` INNER JOIN
- `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
- $field = 'IF(`nat`=\'\', `pays`, `nat`)';
- $id = '`a2`';
+ $ids = DirEnum::getOptions(DirEnum::NATIONALITIES);
break;
- case 'region':
- $db = '`geoloc_region`';
- $field = '`name`';
- $id = '`region`';
- if (isset($_REQUEST['country'])) {
- $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"';
+ case 'region':
+ if ($isset($_REQUEST['country'])) {
+ $ids = DirEnum::getOptions(DirEnum::ADMINAREAS, $_REQUEST['country']);
+ } else {
+ $ids = DirEnum::getOptions(DirEnum::ADMINAREAS);
}
break;
case 'school':
- $db = '`applis_def`';
+ $ids = DirEnum::getOptions(DirEnum::EDUSCHOOLS);
$page->assign('onchange', 'changeSchool(this.value)');
break;
case 'section':
- $db = '`sections`';
+ $ids = DirEnum::getOptions(DirEnum::SECTIONS);
break;
case 'secteur':
- $db = '`emploi_secteur`';
- $field = '`label`';
+ $ids = DirEnum::getOptions(DirEnum::SECTORS);
break;
default: exit();
}
if (isset($idVal)) {
pl_content_headers("text/plain");
- $result = XDB::query('SELECT '.$field.' AS field FROM '.$db.' WHERE '.$id.' = {?} LIMIT 1',$idVal);
- echo $result->fetchOneCell();
+ echo $ids[$idVal];
exit();
}
pl_content_headers("text/xml");
$page->changeTpl('include/field.select.tpl', NO_SKIN);
$page->assign('name', $type);
- $page->assign('list', XDB::iterator('SELECT '.$field.' AS field,
- '.$id.' AS id
- FROM '.$db.$where.'
- GROUP BY '.$field.'
- ORDER BY '.$field));
+ $page->assign('list', $ids);
$page->assign('with_text_value', true);
$page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
}