Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1784 → Rev 1785

/trunk/jrest/services/CoelRecherche.php
347,7 → 347,6
"cs_truk_nom_alternatif LIKE {$p['mots']}",
"cs_description LIKE {$p['mots']}",
"cs_adresse_01 LIKE {$p['mots']}",
"cs_adresse_02 LIKE {$p['mots']}",
"cs_ville LIKE {$p['mots']}",
"cs_truk_identifiant_alternatif LIKE {$p['mots']}",
"cs_condition_acces LIKE {$p['mots']}",
369,16 → 368,12
}
if (isset($p['lieu-stockage'])) {
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv ON cmlv.cmlv_id_valeur = cs_ce_truk_pays';
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv2 ON cmlv2.cmlv_id_valeur = cs_ce_truk_region';
$where[] = '(' . implode(' OR ', array(
"cs_adresse_01 LIKE {$p['lieu-stockage']}",
"cs_adresse_02 LIKE {$p['lieu-stockage']}",
"cs_code_postal LIKE {$p['lieu-stockage']}",
"cs_ville LIKE {$p['lieu-stockage']}",
"cs_ce_truk_region LIKE {$p['lieu-stockage']}",
"cs_ce_truk_pays LIKE {$p['lieu-stockage']}",
"cmlv.cmlv_nom LIKE {$p['lieu-stockage']}",
"cmlv2.cmlv_nom LIKE {$p['lieu-stockage']}"
)) . ')';
}
if (isset($p['zg'])) {
399,12 → 394,6
$where[] = sprintf("cs_code_postal REGEXP '^(%s).*'", implode('|', $p['str-d']));
}
 
// http://download.geonames.org/export/dump/admin1CodesASCII.txt
if (isset($p['regions'])) {
$join[] = 'LEFT JOIN coel_meta_liste_valeur cv ON cv.cmlv_id_valeur = cs_ce_truk_region';
$where[] = sprintf('cv.cmlv_abreviation IN ("%s")', implode('","', $p['regions']));
}
 
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';
459,10 → 448,8
}
if (isset($p['adresse'])) {
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv ON cmlv.cmlv_id_valeur = cp_ce_truk_pays';
$join[] = 'LEFT JOIN coel_meta_liste_valeur cmlv2 ON cmlv2.cmlv_id_valeur = cp_ce_truk_region';
$where[] = '(' . implode(' OR ', array(
"cp_adresse_01 LIKE {$p['adresse']}",
"cp_adresse_02 LIKE {$p['adresse']}",
"cp_code_postal LIKE {$p['adresse']}",
"cp_ville LIKE {$p['adresse']}",
"cp_ce_truk_pays LIKE {$p['adresse']}",
470,7 → 457,6
"cp_naissance_lieu LIKE {$p['adresse']}",
"cp_deces_lieu LIKE {$p['adresse']}",
"cmlv.cmlv_nom LIKE {$p['adresse']}",
"cmlv2.cmlv_nom LIKE {$p['adresse']}"
)) . ')';
}
if (isset($p['date-vivant'])) {