Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1720 → Rev 1721

/trunk/jrest/services/CoelRecherche.php
274,7 → 274,7
// TODO: INNER JOIN
if (isset($p['str-d'])) {
$join[] = 'LEFT JOIN coel_meta_liste_valeur cv ON cv.cmlv_id_valeur = cs_ce_truk_pays';
$where[] = 'cv.cmlv_abreviation = "FR"';
$where[] = "cv.cmlv_abreviation IN ('FR', 'RE', 'YT', 'GP', 'MQ', 'GF', 'NC')";
$where[] = sprintf("cs_code_postal REGEXP '^(%s).*'", implode('|', $p['str-d']));
}
 
285,6 → 285,7
}
 
if (isset($p['pays'])) {
if(array_search('FR', $p['pays']) !== FALSE) $p['pays'] = array_merge($p['pays'], array('RE','YT','GP','MQ','GF','NC'));
$join[] = 'LEFT JOIN coel_meta_liste_valeur cv ON cv.cmlv_id_valeur = cs_ce_truk_pays';
$where[] = sprintf('cv.cmlv_abreviation IN ("%s")', implode('","', $p['pays']));
}