/trunk/jrest/services/CelWidgetImage.php |
---|
54,6 → 54,7 |
$chercheur_images = new RechercheImage($this->config); |
$total = $chercheur_images->compterImages(null, $criteres); |
$images = $chercheur_images->rechercherImagesJoinObservation(null, $criteres, $this->start, $this->limit); |
$images = $this->mettreEnForme($images); |
$resultat = array('total' => $total,'images' => $images); |
$images_json = json_encode($resultat); |
63,4 → 64,35 |
print $images_json; |
exit(); |
} |
public function mettreEnForme($images) { |
$retour = array(); |
foreach ($images as $id => $image) { |
$retour[$id]["utilisateur"]['id_utilisateur'] = $image['id_utilisateur']; |
unset($image['id_utilisateur']); |
$retour[$id]["utilisateur"]['mail_utilisateur'] = $image['mail_utilisateur']; |
unset($image['mail_utilisateur']); |
$retour[$id]["utilisateur"]['nom_utilisateur'] = $image['nom_utilisateur']; |
unset($image['nom_utilisateur']); |
$retour[$id]['id_photo'] = $image['id_photo']; |
unset($image['id_photo']); |
$retour[$id]['guid'] = $image['guid']; |
unset($image['guid']); |
$retour[$id]['nom_original'] = $image['nom_original']; |
unset($image['nom_original']); |
$retour[$id]['date_photo'] = $image['date_photo']; |
unset($image['date_photo']); |
$retour[$id]['licence'] = $image['licence']; |
unset($image['licence']); |
$retour[$id]['attribution'] = $image['attribution']; |
unset($image['attribution']); |
$retour[$id]['url_photo'] = $image['url_photo']; |
unset($image['url_photo']); |
$retour[$id]['tags_photo'] = $image['tags_photo']; |
unset($image['tags_photo']); |
$retour[$id]['obs'] = $image; |
} |
return $retour; |
} |
} |
/trunk/jrest/bibliotheque/RechercheImage.php |
---|
48,7 → 48,18 |
unset($criteres['dir']); |
$debut = ($debut < 0) ? 0 : $debut; |
$requete_recherche_images = 'SELECT ci.*, co.* '; |
$requete_recherche_images = 'SELECT ci.`id_image` as id_photo, co.guid, |
`id_observation` as id_obs, `nom_sel`, `nom_sel_nn`, `zone_geo` as localisation, `latitude`, `longitude`, |
`date_observation` as date_obs, `commentaire`, `certitude`, `grade` as fiabilite, programme as projet, |
`score_identiplante` as score_ip, `url_identiplante` as url_ip, `validation_identiplante` as est_ip_valide, |
co.mots_cles_texte as tags_obs, `nom_ret`, `nom_ret_nn`, `famille`,`nom_referentiel`, `pays`, |
`ce_zone_geo` as code_insee, `dept`, `lieudit`, `station`, `milieu`, `altitude`, `localisation_precision`, |
`localisation_floutage`, `localisation_coherence`, `abondance`, `phenologie`, `spontaneite`, |
`type_donnees`, `biblio`, `source`, `herbier`, `determinateur`, `observateur`, `observateur_structure`, |
`ce_utilisateur` as id_utilisateur, `courriel_utilisateur` as mail_utilisateur, `pseudo_utilisateur` as nom_utilisateur, |
ci.`nom_original`, ci.`date_prise_de_vue` as date_photo, "Creative Commons BY-SA (2.0)" as licence, |
concat(`nom_sel`, " par ", `pseudo_utilisateur`, " [CC BY-SA 2.0 FR], via Tela Botanica") as attribution, |
concat("https://api.tela-botanica.org/img:", lpad(ci.id_image, 9, "0"), "O,") as url_photo, ci.`mots_cles_texte` as tags_photo'; |
$requete_recherche_images .= $this->fabriquerRequeteJointureDblObs(); |
$requete_recherche_images .= ($id_utilisateur != null) ? 'AND co.ce_utilisateur = '.Cel::db()->proteger($id_utilisateur) : ''; |