Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1784 → Rev 1785

/trunk/jrest/services/CoelSyndication.php
438,6 → 438,7
}
private function executerRequete($requete) {
$infos = null;
try {
$infos = $this->bdd->query($requete)->fetchAll(PDO::FETCH_ASSOC);
if ($infos === false) {
486,7 → 487,7
// Construction de la requête pour récupérer les second éléments
$elements_1er_cle_ligne = array();
foreach ($infos_elements_1er as $info) {
$elements_1er_cle_ligne[] = $info['cmhl_cle_ligne'];
$elements_1er_cle_ligne[] = '"'.$info['cmhl_cle_ligne'].'"';
}
$chaine_1er_elements = 'AND h1.cmhl_cle_ligne IN ('.str_replace(',,',',',implode(',', $elements_1er_cle_ligne)).') ';
$requete_elements_2nd = sprintf($requete, $chaine_1er_elements, '2');
609,7 → 610,7
private function getXmlHisto($info) {
$xml = '';
if ($info['cmhl_ce_etat'] == '3') {
$xml = $info['enrg_prec'];
$xml = @$info['enrg_prec'];
} else {
$xml = $info['cmhl_enregistrement'];
}
625,7 → 626,7
}
} else if ($info['cmhl_ce_etat'] == '2') {
$nouveau = $this->getTableauDepuisXmlHisto($info['cmhl_enregistrement']);
$ancien = $this->getTableauDepuisXmlHisto($info['enrg_prec']);
$ancien = @$this->getTableauDepuisXmlHisto($info['enrg_prec']);
foreach ($nouveau as $cle => $valeur) {
if (!isset($ancien[$cle])) {
$diff[$cle] = array('type' => 'A', 'type_txt' => 'Ajout', 'nouveau' => $valeur, 'ancien' => ' ');
651,7 → 652,7
$diff['etat'] = 'A';
} else if ($info['cmhl_ce_etat'] == '2') {
$diff['date_nouvelle'] = strftime($format, strtotime($info['cmhl_date_modification']));
$diff['date_ancienne'] = strftime($format, strtotime($info['date_prec']));
$diff['date_ancienne'] = @strftime($format, strtotime($info['date_prec']));
$diff['etat'] = 'M';
} else if ($info['cmhl_ce_etat'] == '3') {
$diff['etat'] = 'S';
/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'])) {