| 117,7 → 117,8 |
|---|
| */ |
| private function getInfosObs() { |
| $idsObsConcat = implode(',', $this->idsObsOrdonnees); |
| $requete = "SELECT id_observation, nom_sel AS `determination.ns`, nt AS `determination.nt`, ". |
| // TODO : bizarement MYSQL 5.6 retourne plusieurs fois les mêmes enregistrements d'où le DISTINCT (normalement inutile) |
| $requete = "SELECT DISTINCT id_observation, nom_sel AS `determination.ns`, nt AS `determination.nt`, ". |
| 'nom_sel_nn AS `determination.nn`, famille AS `determination.famille`, '. |
| 'nom_referentiel AS `determination.referentiel`, ce_zone_geo AS id_zone_geo, '. |
| 'zone_geo, lieudit, station, milieu, date_observation, do.mots_cles_texte, '. |
| 129,6 → 130,7 |
|---|
| ' LEFT JOIN del_image AS di ON (do.id_observation = di.ce_observation) '. |
| "WHERE id_observation IN ($idsObsConcat) ". |
| ' -- '.__FILE__.':'.__LINE__; |
| //Debug::printr($requete); |
| return $this->bdd->recupererTous($requete); |
| } |
| |
| 140,14 → 142,15 |
|---|
| private function formaterObservations() { |
| $observations = array_map('array_filter', $this->infosObs); |
| $obsFormatees = array_flip($this->idsObsOrdonnees);// Permet de garder l'ordre de sortie ! |
| foreach ($observations as $obs) { |
| foreach ($observations as &$obs) { |
| $this->nettoyerAuteur($obs); |
| |
| $id = $obs['id_observation']; |
| $obsFormatees[$id] = $obs; |
| |
| $image = $this->extraireInfosImage($obs); |
| $obsFormatees[$id]['images'][] = $image; |
| // ATTENTION : la requête retourne de nombreuses lignes avec les mêmes données (test de l'existence nécessaire) |
| if (is_array($obsFormatees[$id]) === false) { |
| $obsFormatees[$id] = $obs; |
| } |
| $obsFormatees[$id]['images'][] = $this->extraireInfosImage($obs); |
| } |
| return $obsFormatees; |
| } |
| Property changes: |
|---|
| Added: svnkit:entry:sha1-checksum |
|---|
| +a907dccbc2c4971fed812325a132c6ba9d675b72 |
|---|
| \ No newline at end of property |
|---|