Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1594 → Rev 1595

/branches/v1.0-hydrogene/services/modules/0.1/DelTk.php
159,19 → 159,21
array('options' => array('default' => NULL,
'min_range' => 0,
'max_range' => _LISTE_OBS_MAX_ID_OBS)));
if(isset($params['masque.departement'])) {
// STRING: 0 -> 95, 971 -> 976, 2A + 2B (./services/configurations/config_departements_bruts.ini)
// accept leading 0 ?
// TODO; filter patterns like 555.
if(preg_match(';^(\d{2}|\d{3}|2a|2b)$;i', $params['masque.departement'])) {
$p['masque.departement'] = $params['masque.departement'];
}
// cf configurations/config_departements_bruts.ini
elseif( !is_null($c) && ( $x = $c->getParametre(
strtolower(str_replace(' ','-',iconv("UTF-8", "ASCII//TRANSLIT", $params['masque.departement'])))
))) {
$p['masque.departement'] = sprintf("INSEE-C:%02d___", $x);
}
if (isset($params['masque.departement'])) {
// STRING: 0 -> 95, 971 -> 976, 2A + 2B (./services/configurations/config_departements_bruts.ini)
// accept leading 0 ?
// TODO; filter patterns like 555.
if (preg_match(';^(\d{2}|\d{3}|2a|2b)$;i', $params['masque.departement']) != 0) {
if(is_numeric($params['masque.departement'])) {
$p['masque.departement'] = str_pad($params['masque.departement'], 5, '_');
} else {
$p['masque.departement'] = $params['masque.departement'];
}
} else {
$dpt_chaine = strtolower(str_replace(' ','-',iconv("UTF-8", "ASCII//TRANSLIT", $params['masque.departement'])));
$c->chargerConfiguration('config_departements_bruts.ini');
$p['masque.departement'] = str_pad($c->getParametre($dpt_chaine), 5, '_');
}
}
 
if(isset($params['masque.date'])) {