| 48,18 → 48,21 |
|---|
| |
| $this->format = (isset($this->parametres['retour.format']) && $this->parametres['retour.format'] != '') ? $this->parametres['retour.format'] : $this->format; |
| $this->retour_mime = (isset($this->parametres['retour']) && $this->parametres['retour'] != '') ? $this->parametres['retour'] : $this->retour_mime; |
| // TODO: décommenter lors de la mise en prod |
| //$photographies = $this->obtenirImages(); |
| //TODO commenter lors de la mise en prod |
| $photographies = $this->getResultatTest(); |
| $this->nbreImages = count($photographies); |
| |
| if($this->retour_mime == self::MIME_JSON) { |
| if($this->retour_mime == self::MIME_JPEG) { |
| $photo = $this->obtenirPremiereImage(); |
| $retour = $this->formaterRetourImageBinaire($photo); |
| echo $retour; |
| } elseif($this->retour_mime == self::MIME_JSON) { |
| $photographies = $this->obtenirImages(); |
| $this->nbreImages = count($photographies); |
| $photographies_formatees = $this->formaterRetourJson($photographies); |
| $resultat = $photographies_formatees; |
| $entete = $this->construireEntete(); |
| return array('entete' => $entete, 'resultats' => $resultat); |
| } elseif ($this->retour_mime == self::MIME_XML) { |
| $photographies = $this->obtenirImages(); |
| $this->nbreImages = count($photographies); |
| $photographies_formatees = $this->formaterRetourXml($photographies); |
| header('Content-Type: '.self::MIME_XML); |
| echo $photographies_formatees; |
| 105,8 → 108,23 |
|---|
| $this->parametres['navigation.limite'] = 100; |
| } |
| } |
| |
| public function obtenirPremiereImage() { |
| $this->parametres['navigation.depart'] = 0; |
| $this->parametres['navigation.limite'] = 1; |
| $images = $this->obtenirImages(); |
| if (!is_array($images) || count($images) <= 0) { |
| $message = "Aucune image ne correspond au numéro numenclatural $refTax:$numNom"; |
| $code = RestServeur::HTTP_CODE_RESSOURCE_INTROUVABLE; |
| throw new Exception($message, $code); |
| } else { |
| return $images[0]; |
| } |
| } |
| |
| public function obtenirImages() { |
| //TODO: tri par date, mais les dates dans la bdd photoflora sont des chaines en entités HTML |
| // donc un tri dessus n'a pas de sens |
| $requete = 'SELECT photos.*,taxons.NumTaxon, taxons.NumNomen, taxons.Combinaison, photographes.Nom, photographes.Prenom, photographes.Initiales, photographes.Mail '. |
| 'FROM '.self::BDD_PF.'.photos, '.self::BDD_PF.'.photographes, '.self::BDD_PF.'.taxons '. |
| 'WHERE '. |
| 148,6 → 166,18 |
|---|
| return $requete_auteur; |
| } |
| |
| private function formaterRetourImageBinaire($photo) { |
| $image = ''; |
| $chemin = $url = $this->getUrlPhotoPourInitiales($photo['Initiales'], $photo['NumPhoto'], $this->format); |
| $image = file_get_contents($chemin); |
| if ($image === false) { |
| $message = "L'image demandée est introuvable sur le serveur : $chemin"; |
| $code = RestServeur::HTTP_CODE_RESSOURCE_INTROUVABLE; |
| throw new Exception($message, $code); |
| } |
| return $image; |
| } |
| |
| private function formaterRetourJson($photographies) { |
| $resultat = array(); |
| if(is_array($photographies)) { |