'search/ajax/region' => $this->make_hook('region', AUTH_COOKIE, 'user', NO_AUTH),
'search/ajax/grade' => $this->make_hook('grade', AUTH_COOKIE, 'user', NO_AUTH),
'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC),
- 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_PUBLIC),
+ 'search/autocomplete' => $this->make_hook('autocomplete', AUTH_COOKIE, 'user', NO_AUTH),
+ 'search/list' => $this->make_hook('list', AUTH_COOKIE, 'user', NO_AUTH),
);
}
user_reindex($uid);
}
- function get_quick($offset, $limit, $order)
- {
- global $globals;
- if (!S::logged()) {
- Env::kill('with_soundex');
- }
- $qSearch = new QuickSearch('quick');
- $fields = new SFieldGroup(true, array($qSearch));
-
- if ($qSearch->isempty()) {
- new ThrowError('Recherche trop générale.');
- }
-
- $sql = 'SELECT SQL_CALC_FOUND_ROWS
- UPPER(IF(u.nom!="",u.nom,u.nom_ini)) AS nom,
- IF(u.prenom!="",u.prenom,u.prenom_ini) AS prenom,
- '.$globals->search->result_fields.'
- c.uid AS contact, w.ni_id AS watch,
- '.$qSearch->get_score_statement().'
- FROM auth_user_md5 AS u
- '.$fields->get_select_statement().'
- LEFT JOIN auth_user_quick AS q ON (u.user_id = q.user_id)
- LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie")
- LEFT JOIN contacts AS c ON (c.uid='.S::i('uid', -1).'
- AND c.contact=u.user_id)
- LEFT JOIN watch_nonins AS w ON (w.ni_id=u.user_id
- AND w.uid='.S::i('uid', -1).')
- '.$globals->search->result_where_statement.'
- WHERE '.$fields->get_where_statement()
- .(S::logged() && Env::has('nonins') ? ' AND u.perms="pending" AND u.deces=0' : '')
- .'
- GROUP BY u.user_id
- ORDER BY '.($order?($order.', '):'')
- .implode(',',array_filter(array($fields->get_order_statement(),
- 'u.promo DESC, NomSortKey, prenom'))).'
- LIMIT '.$offset * $globals->search->per_page.','
- .$globals->search->per_page;
- $list = XDB::iterator($sql);
- $res = XDB::query("SELECT FOUND_ROWS()");
- $nb_tot = $res->fetchOneCell();
- return array($list, $nb_tot);
- }
function form_prepare()
{
global $page;
$page->assign('formulaire',1);
- $page->assign('choix_nats',
- XDB::iterator('SELECT g.a2 AS id, IF(nat=\'\', g.pays, g.nat) AS text
- FROM geoloc_pays AS g
- INNER JOIN auth_user_md5 AS u ON (u.nationalite = g.a2)
- GROUP BY g.a2
- ORDER BY text'));
- $page->assign('choix_postes',
- XDB::iterator('SELECT id,fonction_fr FROM fonctions_def
- ORDER BY fonction_fr'));
- $page->assign('choix_binets',
- XDB::iterator('SELECT id,text FROM binets_def ORDER BY text'));
- $page->assign('choix_groupesx',
- XDB::iterator('SELECT id,text FROM groupesx_def ORDER BY text'));
- $page->assign('choix_sections',
- XDB::iterator('SELECT id,text FROM sections ORDER BY text'));
$page->assign('choix_schools',
XDB::iterator('SELECT id,text FROM applis_def ORDER BY text'));
- $page->assign('choix_secteurs',
- XDB::iterator('SELECT id,label FROM emploi_secteur ORDER BY label'));
$this->get_diplomas();
}
$page->assign('choix_diplomas', explode(',',$types));
}
- function get_advanced($offset, $limit, $order)
- {
- $fields = new SFieldGroup(true, advancedSearchFromInput());
- if ($fields->too_large()) {
- $this->form_prepare();
- new ThrowError('Recherche trop générale.');
- }
- global $globals, $page;
-
- $page->assign('search_vars', $fields->get_url());
-
- $where = $fields->get_where_statement();
- if ($where) {
- $where = "WHERE $where";
- }
- $sql = 'SELECT SQL_CALC_FOUND_ROWS DISTINCT
- u.nom, u.prenom,
- '.$globals->search->result_fields.'
- c.uid AS contact,
- w.ni_id AS watch
- FROM auth_user_md5 AS u
- LEFT JOIN auth_user_quick AS q USING(user_id)
- '.$fields->get_select_statement().'
- '.(Env::has('only_referent') ? ' INNER JOIN mentor AS m ON (m.uid = u.user_id)' : '').'
- LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie")
- LEFT JOIN contacts AS c ON (c.uid='.S::v('uid').'
- AND c.contact=u.user_id)
- LEFT JOIN watch_nonins AS w ON (w.ni_id=u.user_id
- AND w.uid='.S::v('uid').')
- '.$globals->search->result_where_statement."
- $where
- GROUP BY u.user_id
- ORDER BY ".($order?($order.', '):'')
- .implode(',',array_filter(array($fields->get_order_statement(),
- 'promo DESC, NomSortKey, prenom'))).'
- LIMIT '.($offset * $limit).','.$limit;
- $liste = XDB::iterator($sql);
- $res = XDB::query("SELECT FOUND_ROWS()");
- $nb_tot = $res->fetchOneCell();
- return Array($liste, $nb_tot);
- }
-
- function handler_quick(&$page)
+ function handler_quick(&$page, $action = null, $subaction = null)
{
global $globals;
- require_once dirname(__FILE__).'/search/search.inc.php';
-
- $page->changeTpl('search/index.tpl');
-
- $page->assign('xorg_title','Polytechnique.org - Annuaire');
- require_once("applis.func.inc.php");
- require_once("geoloc.inc.php");
-
- $page->assign('baseurl', $globals->baseurl);
-
- if (Env::has('quick')) {
+ if (Env::has('quick') || $action == 'geoloc') {
$page->assign('formulaire', 0);
- $search = new XOrgSearch(array($this, 'get_quick'));
- $search->setNbLines($globals->search->per_page);
- $search->addOrder('score', 'score', false, 'pertinence', AUTH_PUBLIC, true);
-
- $nb_tot = $search->show();
+ require_once 'userset.inc.php';
+ $view = new SearchSet(true, $action == 'geoloc' && substr($subaction, -3) == 'swf');
+ $view->addMod('minifiche', 'Minifiches', true);
+ $view->addMod('trombi', 'Trombinoscope');
+ $view->addMod('geoloc', 'Planishpère');
+ $view->apply('search', $page, $action, $subaction);
+ $nb_tot = $view->count();
+ 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) {
$page->addJsLink('ajax.js');
}
+ require_once dirname(__FILE__) . '/search/search.inc.php';
+ $page->changeTpl('search/index.tpl');
+ $page->assign('xorg_title','Polytechnique.org - Annuaire');
+ $page->assign('baseurl', $globals->baseurl);
$page->register_modifier('display_lines', 'display_lines');
}
- function handler_advanced(&$page, $mode = null)
+ function handler_advanced(&$page, $action = null, $subaction = null)
{
global $globals;
-
- require_once dirname(__FILE__).'/search/search.inc.php';
- require_once 'applis.func.inc.php';
- require_once 'geoloc.inc.php';
-
-
- $page->changeTpl('search/index.tpl', $mode == 'mini' ? SIMPLE : SKINNED);
-
- $page->assign('advanced',1);
- $page->assign('public_directory',0);
-
- if (!Env::has('rechercher')) {
+ if (!Env::has('rechercher') && $action != 'geoloc') {
$this->form_prepare();
} else {
- $search = new XOrgSearch(array($this, 'get_advanced'));
- $search->setNbLines($globals->search->per_page);
-
- $page->assign('url_search_form', $search->make_url(Array('rechercher'=>0)));
- if (!Env::i('with_soundex')) {
- $page->assign('with_soundex', $search->make_url(Array()) . "&with_soundex=1");
+ require_once 'userset.inc.php';
+ $view = new SearchSet(false, $action == 'geoloc' && substr($subaction, -3) == 'swf');
+ $view->addMod('minifiche', 'Minifiches', true);
+ $view->addMod('trombi', 'Trombinoscope');
+ $view->addMod('geoloc', 'Planishpère');
+ $view->apply('search', $page, $action, $subaction);
+
+ if ($subaction) {
+ return;
}
- $nb_tot = $search->show();
-
+ $nb_tot = $view->count();
if ($nb_tot > $globals->search->private_max) {
$this->form_prepare();
new ThrowError('Recherche trop générale');
}
-
}
+ require_once 'geoloc.inc.php';
+ require_once dirname(__FILE__) . '/search/search.inc.php';
+ $page->changeTpl('search/index.tpl', $action == 'mini' ? SIMPLE : SKINNED);
$page->addJsLink('ajax.js');
+ $page->assign('advanced',1);
+ $page->assign('public_directory',0);
$page->register_modifier('display_lines', 'display_lines');
}
// result2|nb2
// ...
header('Content-Type: text/plain; charset="UTF-8"');
- $q = $_REQUEST['q'];
+ $q = preg_replace('/\*+$/','',$_REQUEST['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',
+ $type, $q);
+ if ($res = $cache->fetchOneCell()) {
+ echo $res;
+ die();
+ }
+
+ // default search
$unique = 'user_id';
$db = 'auth_user_md5';
+ $realid = false;
+ $contains = false;
+
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)
+ $contains = true;
+ $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 'entreprise': $db = 'entreprises'; $field = 'entreprise'; $unique='uid'; break;
case 'firstname': $field = 'prenom'; break;
+ case 'fonctionTxt':
+ $db = 'fonctions_def INNER JOIN entreprises ON(entreprises.fonction = fonctions_def.id)';
+ $field = 'fonction_fr';
+ $unique = 'uid';
+ $realid = 'fonctions_def.id';
+ break;
+ case 'groupexTxt':
+ $db = 'groupesx_def INNER JOIN groupesx_ins ON(groupesx_def.id = groupesx_ins.gid)';
+ $field='groupesx_def.text';
+ if (strlen($q) > 2)
+ $contains = true;
+ $realid = 'groupesx_def.id';
+ $unique = 'guid';
+ break;
case 'name': $field = 'nom'; break;
- case 'nickname': $field = 'profile_nick'; break;
- case 'entreprise': $db = 'entreprises'; $field = 'entreprise'; $unique='uid'; 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'; break;
+ case 'poste': $db = 'entreprises'; $field = 'poste'; $unique='uid'; 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';
+ break;
+ case 'sectionTxt':
+ $db = 'sections INNER JOIN auth_user_md5 ON(auth_user_md5.section = sections.id)';
+ $field = 'sections.text';
+ $realid = 'sections.id';
+ break;
default: exit();
}
- $liste = XDB::iterator('SELECT '.$field.' AS field, COUNT(DISTINCT '.$unique.') AS nb FROM '.$db.' WHERE '.$field.' LIKE {?} GROUP BY '.$field.' LIMIT 11', $q.'%');
+ $list = XDB::iterator('
+ SELECT
+ '.$field.' AS field,
+ COUNT(DISTINCT '.$unique.') AS nb
+ '.($realid?(', '.$realid.' AS id'):'').'
+ FROM '.$db.'
+ WHERE '.$field.' LIKE {?}
+ GROUP BY '.$field.'
+ ORDER BY nb DESC
+ LIMIT 11',
+ ($contains?'%':'').str_replace('*','%',$q).'%');
$nbResults = 0;
- while ($result = $liste->next()) {
+ $res = "";
+ while ($result = $list->next()) {
$nbResults++;
if ($nbResults == 11) {
- echo '...|1'."\n";
+ $res .= '...|1'."\n";
} else {
- echo $result['field'].'|'.$result['nb']."\n";
+ $res .= $result['field'].'|'.$result['nb'].(isset($result['id'])?('|'.$result['id']):'')."\n";
}
}
-
+ XDB::query('REPLACE INTO search_autocomplete VALUES ({?}, {?}, {?}, NOW())',
+ $type, $q, $res);
+ 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
+ $field = 'text';
+ $id = 'id';
+ switch ($type) {
+ case 'binet':
+ $db = 'binets_def';
+ break;
+ case 'fonction':
+ $db = 'fonctions_def';
+ $field = 'fonction_fr';
+ break;
+ case 'groupex':
+ $db = 'groupesx_def';
+ break;
+ case 'nationalite':
+ $db = 'geoloc_pays';
+ $field = 'IF(nat=\'\', pays, nat)';
+ $id = 'a2';
+ break;
+ case 'section':
+ $db = 'sections';
+ break;
+ case 'secteur':
+ $db = 'emploi_secteur';
+ $field = 'label';
+ break;
+ default: exit();
+ }
+ if (isset($idVal)) {
+ header('Content-Type: text/plain; charset="UTF-8"');
+ $result = XDB::query('SELECT '.$field.' AS field FROM '.$db.' WHERE '.$id.' = {?} LIMIT 1',$idVal);
+ echo $result->fetchOneCell();
+ } else {
+ header('Content-Type: text/xml; charset="UTF-8"');
+ $list = XDB::iterator('
+ SELECT
+ '.$field.' AS field,
+ '.$id.' AS id
+ FROM '.$db.'
+ ORDER BY '.$field);
+ echo '<select name="'.$type.'">';
+ while ($result = $list->next()) {
+ echo '<option value="'.$result['id'].'">'.htmlspecialchars($result['field']).'</option>';
+ }
+ echo '</select>';
+ }
+
+ exit();
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
projects / platal.git / blobdiff