| 30,7 → 30,6 |
|---|
| } |
| } |
| |
| // Envoi sur la sortie standard |
| $this->envoyer($info); |
| } |
| |
| 52,7 → 51,7 |
|---|
| |
| public function construireConditionRequete() { |
| |
| $condition = ' WHERE oo_date != "0000-00-00" AND '; |
| $condition = ' WHERE oo_date != "0000-00-00" AND DAY(oo_date) != "00" AND '; |
| |
| foreach($_GET as $cle => $valeur) { |
| |
| 63,7 → 62,13 |
|---|
| break; |
| |
| case 'annee': |
| $condition .= 'YEAR(oo_date) = '.$this->proteger($valeur); |
| if($this->anneesMultiplesDemandees($valeur)) { |
| $valeur = rtrim($valeur,','); |
| $condition .= 'YEAR(oo_date) IN ('.$valeur.')'; |
| } else { |
| $condition .= 'YEAR(oo_date) '; |
| $condition .= ' = '.$this->proteger($valeur); |
| } |
| break; |
| |
| case 'mois': |
| 71,7 → 76,7 |
|---|
| break; |
| |
| case 'espece': |
| $condition .= 'oi_ce_espece = '.$this->proteger($valeur); |
| $condition .= 'oi_ce_espece IN ('.$valeur.') '; |
| break; |
| |
| case 'evenement': |
| 104,10 → 109,17 |
|---|
| return $condition; |
| } |
| |
| private function anneesMultiplesDemandees($annee) { |
| // un ensemble d'identifiants est une suite d'identifiants séparés par des virgules |
| // sans virgule terminale |
| $reg_exp = "/^(([0-9])+,)*([0-9])+$/"; |
| return preg_match($reg_exp, $annee); |
| } |
| |
| public function getExportObservationPlat() { |
| |
| $donnees = $this->getExportObservation(); |
| $donnees_formatees = $this->formaterPourExportCSV($donnees); |
| $donnees_formatees = $this->formaterPourExportCSV($donnees); |
| |
| return $donnees_formatees ; |
| } |
| 148,6 → 160,8 |
|---|
| 'evenenement' => $infos_evenement['nom'], |
| 'code_bbch' => $infos_evenement['numero'], |
| 'nom_scientifique' => $nom_espece, |
| 'id_espece' => $id_espece, |
| 'participant' => $observations_infos['os_ce_participant'] |
| ); |
| |
| $id_station = $observations_infos['oi_ce_station']; |