eFlore/Applications.celApplications.annuaireApplications.bazarApplications.dictionnaireApplications.frameworkApplications.galerieApplications.gttApplications.papyrusApplications.projetApplications.referentielApplications.reseauApplications.wikinieFlore/Applications.bibliobotaeFlore/Applications.cel-consultationeFlore/Applications.coeleFlore/Applications.coel-consultationeFlore/Applications.deleFlore/Applications.eflore-consultationeFlore/Applications.moissonnageeFlore/Archives.cel-v1eFlore/Archives.cel-v2eFlore/Archives.chorologieeFlore/Archives.eflore-consultation-v1eFlore/Archives.eflore-consultation-v2eFlore/Archives.eflore-xuleFlore/Archives.herbierseFlore/Projets.communeseFlore/Projets.eflore-projetsSites.gentiana.orgSites.obs-saisons.frSites.outils-naturalistes.frSites.tela-botanica.org

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/jrest/ @ 3835

  → /trunk/jrest/ @ 3836

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 3835 → Rev 3836

/trunk/jrest/services/CelWidgetImage.php
40,13 → 40,19
$this->start = isset($_GET['start']) ? $_GET['start'] : self::start_defaut;
$this->limit = isset($_GET['limit']) ? $_GET['limit'] : self::limit_defaut;
$criteres['recherche'] = isset($_GET['recherche']) ? $_GET['recherche'] : null;
$criteres['taxon'] = isset($_GET['taxon']) ? $_GET['taxon'] : null;
$criteres['referentiel'] = isset($_GET['referentiel']) ? $_GET['referentiel'] : null;
$criteres['taxon'] = isset($_GET['taxon']) ? $_GET['taxon'] : null;
// date debut - fin
$criteres['zone_geo'] = isset($_GET['commune']) ? $_GET['commune'] : null;
$criteres['ce_zone_geo'] = isset($_GET['dept']) ? $_GET['dept'] : null; // separe par ,
$criteres['pays'] = isset($_GET['pays']) ? $_GET['pays'] : null;
$criteres['auteur'] = isset($_GET['auteur']) ? $_GET['auteur'] : null;
$criteres['programme'] = isset($_GET['programme']) ? $_GET['programme'] : null;
$criteres['mots_cles'] = isset($_GET['tag']) ? $_GET['tag'] : null;
$criteres['auteur'] = isset($_GET['auteur']) ? $_GET['auteur'] : null;
$criteres['zone_geo'] = isset($_GET['commune']) ? $_GET['commune'] : null;
$criteres['taxon'] = isset($_GET['taxon']) ? $_GET['taxon'] : null;
$criteres['ce_zone_geo'] = isset($_GET['dept']) ? $_GET['dept'] : null;
$criteres['famille'] = isset($_GET['famille']) ? $_GET['famille'] : null;
$criteres['recherche'] = isset($_GET['recherche']) ? $_GET['recherche'] : null;
$criteres['standard'] = isset($_GET['standard']) ? $_GET['standard'] : 1;
$criteres['tri'] = isset($_GET['tri']) ? $_GET['tri'] : self::tri_defaut;
$criteres['dir'] = isset($_GET['dir']) ? $_GET['dir'] : self::dir_defaut;
54,7 → 60,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);
$images = $this->mettreEnForme($images);
$resultat = array('total' => $total,'images' => $images);
$images_json = json_encode($resultat);
65,34 → 71,34
exit();
}
public function mettreEnForme($images) {
$retour = array();
foreach ($images as $id => $image) {
$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]["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]['obs'] = $image;
}
return $retour;
$retour = array();
foreach ($images as $id => $image) {
$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]["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]['obs'] = $image;
}
return $retour;
}
}