<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2009 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
S::logger()->log('search', 'quick=' . $quick);
}
$list = 'profile|prf|fiche|fic|referent|ref|mentor';
- if (S::has_perms()) {
+ if (S::admin()) {
$list .= '|admin|adm|ax';
}
if (preg_match('/^(' . $list . '):([-a-z]+(\.[-a-z]+(\.\d{2,4})?)?)$/', replace_accent($quick), $matches)) {
$this->form_prepare();
} else {
$textFields = array(
- 'country' => array('field' => 'a2', 'table' => 'geoloc_pays', 'text' => 'pays', 'exact' => false),
+ 'country' => array('field' => 'iso_3166_1_a2', 'table' => 'geoloc_countries', 'text' => 'countryFR',
+ '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'),
+ 'secteur' => array('field' => 'id', 'table' => 'profile_job_sector_enum', 'text' => 'name', 'exact' => false),
+ 'nationalite' => array('field' => 'iso_3166_1_a2', 'table' => 'geoloc_countries',
+ 'text' => 'nationalityFR', '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",
+ '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' => 'profile_education_enum', 'text' => 'name', 'exact' => false),
- 'city' => array('table' => 'geoloc_city', 'text' => 'name', 'exact' => false)
+ 'city' => array('table' => 'geoloc_localities', 'text' => 'name', 'exact' => false)
);
if (!Env::has('page')) {
S::logger()->log('search', 'adv=' . var_export($_GET, true));
$beginwith = true;
$field2 = false;
$qsearch = str_replace(array('%', '_'), '', $q);
+ $distinct = true;
switch ($type) {
case 'binetTxt':
$realid = '`profile_networking_enum`.`network_type`';
break;
case 'city':
- $db = '`geoloc_city` INNER JOIN
- `adresses` ON(`geoloc_city`.`id` = `adresses`.`cityid`)';
- $unique='`uid`';
- $field='`geoloc_city`.`name`';
+ $db = 'geoloc_localities INNER JOIN
+ profile_addresses ON (geoloc_localities.id = profile_addresses.localityId)';
+ $unique = 'uid';
+ $field ='geoloc_localities.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`';
+ $db = 'geoloc_countries INNER JOIN
+ profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryId)';
+ $unique = 'pid';
+ $field = 'geoloc_countries.countryFR';
+ $realid = 'geoloc_countries.iso_3166_1_a2';
break;
case 'entreprise':
- $db = '`entreprises`';
- $field = '`entreprise`';
- $unique = '`uid`';
- break;
- case 'firstname':
- $field = '`prenom`';
- $beginwith = false;
+ $db = 'profile_job_enum INNER JOIN
+ profile_job ON (profile_job.jobid = profile_job_enum.id)';
+ $field = 'profile_job_enum.name';
+ $unique = 'profile_job.uid';
break;
case 'fonctionTxt':
- $db = '`fonctions_def` INNER JOIN
- `entreprises` ON(`entreprises`.`fonction` = `fonctions_def`.`id`)';
- $field = '`fonction_fr`';
- $unique = '`uid`';
- $realid = '`fonctions_def`.`id`';
+ $db = 'fonctions_def INNER JOIN
+ profile_job ON (profile_job.fonctionid = fonctions_def.id)';
+ $field = 'fonction_fr';
+ $unique = 'uid';
+ $realid = 'fonctions_def.id';
$beginwith = false;
break;
case 'groupexTxt':
$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` 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`)';
- $realid = '`geoloc_pays`.`a2`';
+ $db = 'geoloc_countries INNER JOIN
+ auth_user_md5 ON (geoloc_countries.a2 = auth_user_md5.nationalite
+ OR geoloc_countries.a2 = auth_user_md5.nationalite2
+ OR geoloc_countries.a2 = auth_user_md5.nationalite3)';
+ $field = 'geoloc_countries.nationalityFR';
+ $realid = 'geoloc_countries.iso_3166_1_a2';
break;
- case 'nickname':
- $field = '`profile_nick`';
- $db = '`auth_user_quick`';
- $beginwith = false;
- break;
- case 'poste':
- $db = '`entreprises`';
- $field = '`poste`';
- $unique = '`uid`';
+ case 'description':
+ $db = 'profile_job';
+ $field = 'description';
+ $unique = 'uid';
break;
case 'schoolTxt':
$db = 'profile_education_enum INNER JOIN
$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`';
+ $db = 'profile_job_sector_enum INNER JOIN
+ profile_job ON (profile_job.sectorid = profile_job_sector_enum.id)';
+ $field = 'profile_job_sector_enum.name';
+ $realid = 'profile_job_sector_enum.id';
+ $unique = 'uid';
+ $beginwith = false;
+ break;
+ case 'subSubSector':
+ $db = 'profile_job_subsubsector_enum';
+ $field = 'name';
$beginwith = false;
+ $unique = 'name';
+ $distinct = false;
break;
case 'sectionTxt':
$db = '`sections` INNER JOIN
$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') : '') . '
+ $list = XDB::iterator('SELECT ' . $field_select . ' AS field'
+ . ($distinct ? (', 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
+ ORDER BY ' . ($distinct ? 'nb DESC' : $field_select) . '
LIMIT 11',
$qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch,
$qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch, $qsearch);
$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'];
}
$id = '`network_type`';
break;
case 'country':
- $db = '`geoloc_pays`';
- $field = '`pays`';
- $id = '`a2`';
+ $db = 'geoloc_countries';
+ $field = 'countryFR';
+ $id = 'iso_3166_1_a2';
$page->assign('onchange', 'changeCountry(this.value)');
break;
case 'fonction':
$field = 'nom';
break;
case 'nationalite':
- $db = '`geoloc_pays` INNER JOIN
- `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`';
+ $db = 'geoloc_countries INNER JOIN
+ auth_user_md5 ON (geoloc_countries.iso_3166_1_a2 = auth_user_md5.nationalite
+ OR geoloc_countries.iso_3166_1_a2 = auth_user_md5.nationalite2
+ OR geoloc_countries.iso_3166_1_a2 = auth_user_md5.nationalite3)';
+ $field = 'nationalityFR';
+ $id = 'iso_3166_1_a2';
break;
case 'region':
- $db = '`geoloc_region`';
- $field = '`name`';
- $id = '`region`';
+ $db = 'geoloc_administrativeareas';
+ $field = 'name';
+ $id = 'id';
if (isset($_REQUEST['country'])) {
- $where .= ' WHERE `a2` = "'.$_REQUEST['country'].'"';
+ $where .= ' WHERE country = "' . $_REQUEST['country'] . '"';
}
break;
case 'school':
$db = '`sections`';
break;
case 'secteur':
- $db = '`emploi_secteur`';
- $field = '`label`';
+ $db = 'profile_job_sector_enum INNER JOIN
+ profile_job ON (profile_job.sectorid = profile_job_sector_enum.id)';
+ $field = 'profile_job_sector_enum.name';
+ $id = 'profile_job_sector_enum.id';
break;
default: exit();
}
projects / platal.git / blobdiff