Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 312 → Rev 313

/trunk/services/modules/0.1/photoflora/Images.php
153,7 → 153,8
foreach ($photographies as $photo) {
 
$image = array();
$url = $this->getUrlPhotoPourInitiales($photo['Initiales'], $photo['NumPhoto']);
$url = $this->getUrlPhotoPourInitiales($photo['Initiales'], $photo['NumPhoto'], $this->format);
$urlmax = $this->getUrlPhotoPourInitiales($photo['Initiales'], $photo['NumPhoto'], 'max');
$id = str_replace(array('.jpg','.jpeg'),'',$photo['NumPhoto']);
// Post-traitement des valeurs
$image['station'] = $this->formaterChaineEncodeeBddPhotoflora($photo['lieu']);
163,6 → 164,7
$image['determination.nom_sci'] = $photo['Combinaison'];
$image['determination.nom_sci.code'] = "bdtfx.".$photo['NumNomen'];
$image['binaire.href'] = $url;
$image['binaire.hrefmax'] = $urlmax;
$resultat[$id] = $image;
}
186,7 → 188,7
$xml .= ' xmlns:dcterms="http://purl.org/dc/terms">'."\n";
foreach ($photographies as $photo) {
$url = $this->getUrlPhotoPourInitiales($photo['Initiales'], $photo['NumPhoto']);
$url = $this->getUrlPhotoPourInitiales($photo['Initiales'], $photo['NumPhoto'], $this->format);
// Post-traitement des valeurs
$photo['lieu'] = preg_replace('/^[ ]*:[ ]*/', '', $photo['lieu']);
211,17 → 213,17
return $xml;
}
private function getUrlPhotoPourInitiales($initiales, $num_photo) {
private function getUrlPhotoPourInitiales($initiales, $num_photo, $format) {
// Gestion des urls des photos
$url = '';
if ($initiales == 'bb') {
$base_url = ($this->format == 'max') ? $this->efph_url_photo_bb : $this->efph_url_photo_bb_min;
$base_url = ($format == 'max') ? $this->efph_url_photo_bb : $this->efph_url_photo_bb_min;
$url = sprintf($base_url, $num_photo);
} else if ($initiales == 'jlt') {
$base_url = ($this->format == 'max') ? $this->efph_url_photo_jlt : $this->efph_url_photo_jlt_min;
$base_url = ($format == 'max') ? $this->efph_url_photo_jlt : $this->efph_url_photo_jlt_min;
$url = sprintf($base_url, $num_photo);
} else {
$base_url = ($this->format == 'max') ? $this->efph_url_photo : $this->efph_url_photo_min;
$base_url = ($format == 'max') ? $this->efph_url_photo : $this->efph_url_photo_min;
$url = sprintf($base_url, $initiales, $num_photo);
}