Subversion Repositories eFlore/Applications.del

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2226 → Rev 2227

/branches/v1.11-magnesium/services/modules/0.1/plantnet/Changements.php
5,6 → 5,9
* 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
54,11 → 57,11
$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();
}
 
if (! isset($parametres['ordre'])) {
95,25 → 98,27
--------------------------------------------------------------------------------*/
 
private function getIdsObsImg() {
$date_debut = "'{$this->parametres['date.debut']}'";
$date_fin = "'{$this->parametres['date.fin']}'";
$limite = @min(intval($this->parametres['navigation.limite']), 1000);
$limite = $limite ? $limite : 100; // 0 => 10
$date_debut = date('Y-m-d H:i:s', $this->parametres['date.debut']);
$date_fin = date('Y-m-d H:i:s', $this->parametres['date.fin']);
$limite = isset($this->parametres['navigation.limite']) ? intval($this->parametres['navigation.limite']) : 10;
$depart = intval(@$this->parametres['navigation.depart']);
$ordre = $this->parametres['ordre'];
$date_debut = "'{$date_debut}'";
$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, '.
'SELECT SQL_CALC_FOUND_ROWS p.id_observation, GROUP_CONCAT(DISTINCT p.id_image) as id_image, '.
'iv.moyenne AS moyenne_votes, '.
'iv.nb_votes AS nb_votes, '.
'iv.nb_points AS nb_points_votes, '.
'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('U', strtotime($date_fin)).') '.
' LEFT JOIN del_image_vote AS iv '.
' AND modif_date >= '.$date_debut.' '.
' AND modif_date <= '.$date_fin.') '.
' LEFT JOIN del_image_stat AS iv '.
' ON (id_image = iv.ce_image AND iv.ce_protocole = 3) '.
' LEFT JOIN del_image_tag AS it '.
' ON (id_image = it.ce_image AND it.actif = 1) '.
121,12 → 126,12
' ON (p.id_observation = c.ce_observation) '.
' LEFT JOIN del_commentaire_vote AS cv '.
' ON (c.id_commentaire = cv.ce_proposition) '.
'GROUP BY id_image, p.id_observation '.
'GROUP BY p.id_observation '.
'ORDER BY modif_date ' . $ordre . ' '.
'LIMIT '.$depart.', '.$limite.
' -- '.__FILE__.':'.__LINE__;
 
return $this->bdd->recupererTous($requete);
// On récupère id_obs, id_image, votes, tags, modif_date
}
 
private function getTotal() {
146,17 → 151,17
$idsImgConcat = implode(',', $idsImg);
 
$requete = 'SELECT '.
'p.id_observation, p.id_image, '.
'cp.id_plantnet, ' .
'p.nom_sel, '.
'p.nom_referentiel, p.nom_ret, p.famille, '.
'p.zone_geo, p.latitude, p.longitude, '.
'p.date_observation, p.date_creation, p.date_transmission, '.
'p.mots_cles_texte, '.
'p.ce_utilisateur, p.prenom_utilisateur, p.nom_utilisateur, p.courriel_utilisateur, '.
'p.i_mots_cles_texte AS mots_cles_texte_image, p.nom_original AS nom_image '.
'p.id_observation, p.id_plantnet, p.id_image, '.
'cp.plant_net_occurrence_id, ' .
'p.nom_sel, p.nom_sel_nn, p.nom_ret, p.nom_ret_nn,'.
'p.nom_referentiel, p.famille, '.
'p.zone_geo, p.latitude, p.longitude,'.
'p.date_observation, p.date_created, p.date_published, '.
'p.type_donnees, p.identiplante_score, p.is_identiplante_validated, p.mots_cles_cel_obs, p.programme, '.
'p.ce_utilisateur, p.courriel_utilisateur, '.
'p.original_name AS nom_image, p.i_date_shot AS date_shot, p.i_date_updated AS image_updated, p.mots_cles_cel_image AS mots_cles_cel_image '.
'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
181,53 → 186,68
$imgCelTpl = $this->conteneur->getParametre('cel_img_url_tpl');
foreach ($this->idsObsImg as $ids) {
$idobs = $ids['id_observation'];
$idimg = $ids['id_image'];
$idimg = explode(',', $ids['id_image']);
 
$imgdata = $this->infosObsImg[$idimg];
$obs[$idobs]['id_observation'] = $idobs;
 
if (!isset($obs[$idobs])) {
$obs[$idobs] = array();
}
foreach ($idimg as $image){
$imgInfos = null;
$imgdata = null;
 
$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]['auteur_courriel'] = $imgdata['courriel_utilisateur'];
$imgdata = $this->infosObsImg[$image];
$imgInfos = $this->recupererInfosParImage($image);
 
$obs[$idobs]['mots_cles_obs_cel'] = $this->formaterMotsClesCel($imgdata['mots_cles_texte']);
if (!isset($obs[$idobs])) {
$obs[$idobs] = array();
}
 
$obs[$idobs]['date_observation'] = $imgdata['date_observation'];
$obs[$idobs]['date_publication'] = $imgdata['date_transmission'];
$obs[$idobs]['date_creation'] = $imgdata['date_creation'];
$obs[$idobs]['date_changement'] = $ids['modif_date'];
$obs[$idobs]['id_plantnet'] = $imgdata['id_plantnet'];
$obs[$idobs]['auteur_courriel'] = $imgdata['courriel_utilisateur'];
 
$obs[$idobs]['nom_sel'] = $imgdata['nom_sel'];
$obs[$idobs]['nom_referentiel'] = $imgdata['nom_referentiel'];
$obs[$idobs]['nom_ret'] = $imgdata['nom_ret'];
//$obs[$idobs]['nn'] = $imgdata['nom_ret_nn'];
//$obs[$idobs]['nt'] = $imgdata['nt'];
$obs[$idobs]['famille'] = $imgdata['famille'];
$obs[$idobs]['mots_cles_cel_obs'] = $imgdata['mots_cles_cel_obs'];
$obs[$idobs]['programme'] = $imgdata['programme'];
 
$obs[$idobs]['zone_geo'] = $imgdata['zone_geo'];
$obs[$idobs]['latitude'] = floatval($imgdata['latitude']);
$obs[$idobs]['longitude'] = floatval($imgdata['longitude']);
$obs[$idobs]['date_observation'] = $imgdata['date_observation'];
$obs[$idobs]['date_creation'] = $imgdata['date_created'];
$obs[$idobs]['date_changement'] = $ids['modif_date'];
$obs[$idobs]['date_publication'] = $imgdata['date_published'];
$obs[$idobs]['type_donnees'] = $imgdata['type_donnees'];
$obs[$idobs]['identiplante_score'] = $imgdata['identiplante_score'];
$obs[$idobs]['is_identiplante_validated'] = $imgdata['is_identiplante_validated'];
 
if (!isset($obs[$idobs]['images'])) {
$obs[$idobs]['images'] = array();
}
$obs[$idobs]['nom_sel'] = $imgdata['nom_sel'];
$obs[$idobs]['nom_sel_nn'] = $imgdata['nom_sel_nn'];
$obs[$idobs]['nom_referentiel'] = $imgdata['nom_referentiel'];
$obs[$idobs]['nom_ret'] = $imgdata['nom_ret'];
$obs[$idobs]['nom_ret_nn'] = $imgdata['nom_ret_nn'];
$obs[$idobs]['famille'] = $imgdata['famille'];
 
$img_obj = array(
'id_image' => $idimg,
'nom_image' => $imgdata['nom_image'],
'url' => sprintf($imgCelTpl, $idimg, 'O'),
'votes' => array_map('intval', explode(',', $ids['votes'])),
'tags' => explode(',', $ids['tags']),
'mots_cles_img_cel' => $this->formaterMotsClesCel($imgdata['mots_cles_texte_image'])
);
// push
$obs[$idobs]['images'][] = $img_obj;
$obs[$idobs]['zone_geo'] = $imgdata['zone_geo'];
$obs[$idobs]['latitude'] = $imgdata['latitude'];
$obs[$idobs]['longitude'] = $imgdata['longitude'];
 
if (!isset($obs[$idobs]['images'])) {
$obs[$idobs]['images'] = array();
}
 
$img_obj = array(
'id_image' => $image,
'nom_image' => $imgdata['nom_image'],
'image_updated' => $imgdata['image_updated'],
'date_shot' => $imgdata['date_shot'],
'mots_cles_cel_image' => $imgInfos[0]['mots_cles_cel_image'],
'url' => sprintf($imgCelTpl, $idimg, 'O'),
'votes' => [
'moyenne_votes' => $imgInfos[0]['moyenne_votes'],
'nb_votes' => $imgInfos[0]['nb_votes'],
'nb_points_votes' => $imgInfos[0]['nb_points_votes'],
],
'del_tags' => explode(',', $imgInfos[0]['del_image_tags']),
);
// push
$obs[$idobs]['images'][] = $img_obj;
}
 
}
return $obs;
}
316,4 → 336,25
return $ret;
}
 
/**
* On charge les infos spécifique à chaque image d'une obs
*/
private function recupererInfosParImage($id_image){
$requete =
'SELECT SQL_CALC_FOUND_ROWS p.id_image, '.
'p.mots_cles_cel_image, '.
'iv.moyenne AS moyenne_votes, '.
'iv.nb_votes AS nb_votes, '.
'iv.nb_points AS nb_points_votes, '.
'GROUP_CONCAT(DISTINCT it.tag) AS del_image_tags '.
'FROM del_plantnet_images AS p '.
' LEFT JOIN del_image_stat AS iv '.
' ON (id_image = iv.ce_image AND iv.ce_protocole = 3) '.
' LEFT JOIN del_image_tag AS it '.
' ON (id_image = it.ce_image AND it.actif = 1) '.
' WHERE id_image = '. $id_image .' '.
'GROUP BY p.id_image '.
' -- '.__FILE__.':'.__LINE__;
return $this->bdd->recupererTous($requete);
}
}
Property changes:
Added: svn:mergeinfo
Merged /trunk/services/modules/0.1/plantnet/Changements.php:r2226
Merged /branches/v1.2-lithium/services/modules/0.1/plantnet/Changements.php:r1676
Merged /branches/v1.5-carbone/services/modules/0.1/plantnet/Changements.php:r1893-1921,1942
Merged /branches/v1.10-sodium/services/modules/0.1/plantnet/Changements.php:r2096,2116,2120,2138-2139,2143,2145
Merged /branches/v1.0-hydrogene/services/modules/0.1/plantnet/Changements.php:r1507
Merged /branches/v1.7-oxygene/services/modules/0.1/plantnet/Changements.php:r2003,2006-2007,2009-2010
Merged /branches/v1.3-beryllium/services/modules/0.1/plantnet/Changements.php:r1753,1758
Merged /branches/v1.6-azote/services/modules/0.1/plantnet/Changements.php:r1988