Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 2212 → Rev 2213

/trunk/services/modules/0.1/plantnet/Changements.php
26,7 → 26,6
 
private $parametres = array();
private $ressources = array();
private $date_defaut = '1900-01-01';
private $ordre_defaut = 'asc';
private $idsObsImg = array();
private $infosObsImg = array();
54,10 → 53,14
$this->ressources = $ressources;
$this->parametres = $parametres;
 
if (!isset($parametres['date'])) {
$this->parametres['date'] = $this->date_defaut;
if (!isset($parametres['date.debut'])) {
$this->parametres['date.debut'] = '1900-01-01';
}
 
if (!isset($parametres['date.fin'])) {
$this->parametres['date.fin'] = date('Y-m-d');
}
 
if (! isset($parametres['ordre'])) {
$this->parametres['ordre'] = $this->ordre_defaut;
} else {
92,7 → 95,8
--------------------------------------------------------------------------------*/
 
private function getIdsObsImg() {
$date_debut = "'{$this->parametres['date']}'";
$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
$depart = intval(@$this->parametres['navigation.depart']);
107,7 → 111,8
'FROM del_plantnet AS p '.
' JOIN del_observation_modif_date '.
' ON (p.id_observation = del_observation_modif_date.id_observation '.
' AND modif_date >= '.$date_debut.') '.
' AND modif_date >= '.date('U', strtotime($date_debut)).') '.
' AND modif_date <= '.date('U', strtotime($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 '.
142,16 → 147,16
 
$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.i_mots_cles_texte AS mots_cles_texte_image, p.nom_original AS nom_image, '.
'cp.id_plantnet '.
'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 '.
'FROM del_plantnet AS p '.
'LEFT JOIN tb_cel_test.cel_plantnet AS cp ON p.id_observation = cp.id_observation '.
'LEFT JOIN tb_cel.cel_plantnet AS cp ON p.id_observation = cp.id_observation '.
"WHERE id_image IN ($idsImgConcat) ".
' -- '.__FILE__.':'.__LINE__;
// recuperer les donnees
189,6 → 194,7
$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'];
 
$obs[$idobs]['mots_cles_obs_cel'] = $this->formaterMotsClesCel($imgdata['mots_cles_texte']);