WebSVN – eFlore/Applications.del – Diff – /trunk/services/modules/0.1/plantnet/Changements.php

  * Le web service plantnet récupère toutes les infos de la vue del_plantnet.
  * Ordonées par date de modification.
  * Les images sont regroupées en observations.
  * Les tags, les votes et les propositions de determinations sont intégrés à l'observation.
+ *
+ * Paramètres: date.debut et date.fin (unixtime en secondes), navigation.limite (10 par défaut), navigation.depart, ordre (DESC par défaut)
+ * Ne pas Oublier l'api key dans le header $_SERVER['HTTP_API_KEY']
+ *
  * @category DEL
  * @package Services
  * @subpackage Plantnet
  * @version 0.1
  * @author Mathias CHOUET <mathias@tela-botanica.org>
 	private $navigation;
 	private $bdd;
 	private $parametres = array();
 	private $ressources = array();
-	private $ordre_defaut = 'asc';
+	private $ordre_defaut = 'DESC';
 	private $idsObsImg = array();
 	private $infosObsImg = array();
 		// initialiserRessourcesEtParametres()
 		$this->ressources = $ressources;
 		$this->parametres = $parametres;
 		if (!isset($parametres['date.debut'])) {
-			$this->parametres['date.debut'] = '1900-01-01';
+			$this->parametres['date.debut'] = '0';
+		}
 		if (!isset($parametres['date.fin'])) {
-			$this->parametres['date.fin'] = date('Y-m-d');
+			$this->parametres['date.fin'] = time();
+		}
 	/*-------------------------------------------------------------------------------
 								CHARGEMENT DES IMAGES
 	--------------------------------------------------------------------------------*/
 	private function getIdsObsImg() {
-		$date_debut = "'{$this->parametres['date.debut']}'";
+        $date_debut = date('Y-m-d H:i:s', $this->parametres['date.debut']);
-		$date_fin = "'{$this->parametres['date.fin']}'";
+        $date_fin = date('Y-m-d H:i:s', $this->parametres['date.fin']);
 		$limite = @min(intval($this->parametres['navigation.limite']), 1000);
-		$limite = $limite ? $limite : 100; // 0 => 10
+		$limite = $limite ?: 100; // 0 => 10
 		$depart = intval(@$this->parametres['navigation.depart']);
+		$ordre = $this->parametres['ordre'];
+        $date_debut = "'{$date_debut}'";
-		$ordre = $this->parametres['ordre'];
+        $date_fin = "'{$date_fin}'";
 		$requete =
 			'SELECT SQL_CALC_FOUND_ROWS p.id_observation, p.id_image, '.
 			'GROUP_CONCAT(iv.valeur) AS votes, '.
-			'GROUP_CONCAT(DISTINCT tag) AS tags, '.
-			'modif_date '.
+			'GROUP_CONCAT(DISTINCT it.tag) AS del_image_tags, '.
 			'modif_date '.
 			'FROM del_plantnet AS p '.
 			'	JOIN del_observation_modif_date '.
 			'		ON (p.id_observation = del_observation_modif_date.id_observation '.
-			'		AND modif_date >= '.date('U', strtotime($date_debut)).') '.
+			'		AND modif_date >= '.$date_debut.' '.
-			'		AND modif_date <= '.date('U', strtotime($date_fin)).') '.
+			'		AND modif_date <= '.$date_fin.') '.
 			'	LEFT JOIN del_image_vote AS iv '.
 			'		ON (id_image = iv.ce_image AND iv.ce_protocole = 3) '.
 			'	LEFT JOIN del_image_tag AS it '.
 			'ORDER BY modif_date ' . $ordre . ' '.
 			'LIMIT '.$depart.', '.$limite.
 			' -- '.__FILE__.':'.__LINE__;
+		return $this->bdd->recupererTous($requete);
-		return $this->bdd->recupererTous($requete);
+        // On récupère id_obs, id_image, votes, tags, modif_date
+	}
 	private function getTotal() {
 			$idsImg[] = $id;
+		}
 		$idsImgConcat = implode(',', $idsImg);
 		$requete = 'SELECT '.
-			'p.id_observation, p.id_image, '.
+			'p.id_observation, p.plantnet_id, p.id_image, '.
-			'cp.id_plantnet, ' .
+			'cp.plant_net_occurrence_id, ' .
-			'p.nom_sel, '.
+			'p.nom_sel, p.nom_sel_nn, p.nom_ret, p.nom_ret_nn,'.
-			'p.nom_referentiel, p.nom_ret, p.famille, '.
+			'p.nom_referentiel, p.famille, '.
-			'p.zone_geo, p.latitude, p.longitude, '.
+			'p.zone_geo, p.altitude,'.
-			'p.date_observation, p.date_creation, p.date_transmission, '.
+			'p.date_observation, p.date_created, p.date_published, '.
-			'p.mots_cles_texte, '.
+			'p.is_wild, p.identiplante_score, p.is_identiplante_validated, p.cel_photo_tag, '.
-			'p.ce_utilisateur, p.prenom_utilisateur, p.nom_utilisateur, p.courriel_utilisateur, '.
+			'p.ce_utilisateur, p.courriel_utilisateur, '.
-			'p.i_mots_cles_texte AS mots_cles_texte_image, p.nom_original AS nom_image '.
+			'p.original_name AS nom_image, p.i_date_updated AS image_updated '.
 			'FROM del_plantnet AS p '.
-			'LEFT JOIN tb_cel.cel_plantnet AS cp ON p.id_observation = cp.id_observation '.
+			'LEFT JOIN tb_new_cel.pn_tb_pair AS cp ON p.id_observation = cp.occurrence_id '.
 			"WHERE id_image IN ($idsImgConcat) ".
 			' -- '.__FILE__.':'.__LINE__;
 		// recuperer les donnees
 			if (!isset($obs[$idobs])) {
 				$obs[$idobs] = array();
+			}
 			$obs[$idobs]['id_observation'] = $idobs;
-			$obs[$idobs]['id_plantnet'] = $imgdata['id_plantnet'];
-			$obs[$idobs]['auteur_id'] = $imgdata['ce_utilisateur'];
-			$obs[$idobs]['auteur_prenom'] = $imgdata['prenom_utilisateur'];
-			$obs[$idobs]['auteur_nom'] = $imgdata['nom_utilisateur'];
+			$obs[$idobs]['plantnet_id'] = $imgdata['plantnet_id'];
 			$obs[$idobs]['auteur_courriel'] = $imgdata['courriel_utilisateur'];
+            $obs[$idobs]['mots_cles_obs_cel'] = $imgdata['cel_photo_tag'];
-			$obs[$idobs]['mots_cles_obs_cel'] = $this->formaterMotsClesCel($imgdata['mots_cles_texte']);
+			$obs[$idobs]['date_observation'] = $imgdata['date_observation'];
+            $obs[$idobs]['date_creation'] = $imgdata['date_created'];
-			$obs[$idobs]['date_observation'] = $imgdata['date_observation'];
+            $obs[$idobs]['date_changement'] = $ids['modif_date'];
+			$obs[$idobs]['date_publication'] = $imgdata['date_published'];
-			$obs[$idobs]['date_publication'] = $imgdata['date_transmission'];
+			$obs[$idobs]['is_wild'] = $imgdata['is_wild'];
+			$obs[$idobs]['identiplante_score'] = $imgdata['identiplante_score'];
-			$obs[$idobs]['date_creation'] = $imgdata['date_creation'];
+			$obs[$idobs]['is_identiplante_validated'] = $imgdata['is_identiplante_validated'];
 			$obs[$idobs]['date_changement'] = $ids['modif_date'];
+			$obs[$idobs]['nom_sel'] = $imgdata['nom_sel'];
-			$obs[$idobs]['nom_sel'] = $imgdata['nom_sel'];
-			$obs[$idobs]['nom_referentiel'] = $imgdata['nom_referentiel'];
+			$obs[$idobs]['nom_sel_nn'] = $imgdata['nom_sel_nn'];
-			$obs[$idobs]['nom_ret'] = $imgdata['nom_ret'];
+			$obs[$idobs]['nom_referentiel'] = $imgdata['nom_referentiel'];
-			//$obs[$idobs]['nn'] = $imgdata['nom_ret_nn'];
+			$obs[$idobs]['nom_ret'] = $imgdata['nom_ret'];
-			//$obs[$idobs]['nt'] = $imgdata['nt'];
-			$obs[$idobs]['famille'] = $imgdata['famille'];
+			$obs[$idobs]['nom_ret_nn'] = $imgdata['nom_ret_nn'];
 			$obs[$idobs]['famille'] = $imgdata['famille'];
 			$obs[$idobs]['zone_geo'] = $imgdata['zone_geo'];
-			$obs[$idobs]['latitude'] = floatval($imgdata['latitude']);
+			$obs[$idobs]['zone_geo'] = $imgdata['zone_geo'];
-			$obs[$idobs]['longitude'] = floatval($imgdata['longitude']);
+			$obs[$idobs]['altitude'] = $imgdata['altitude'];
+			if (!isset($obs[$idobs]['images'])) {
-			if (!isset($obs[$idobs]['images'])) {
+				$obs[$idobs]['images'] = array();
 				$obs[$idobs]['images'] = array();
-			}
+			$img_obj = array(
-			$img_obj = array(
+				'id_image' => $idimg,
-				'id_image' => $idimg,
+				'nom_image' => $imgdata['nom_image'],
-				'nom_image' => $imgdata['nom_image'],
+                'image_updated' => $imgdata['image_updated'],
 				'url' => sprintf($imgCelTpl, $idimg, 'O'),
 				'votes' => array_map('intval', explode(',', $ids['votes'])),

Subversion Repositories eFlore/Applications.del

(root)/trunk/services/modules/0.1/plantnet/Changements.php – Rev 2213 → 2222