Subversion Repositories eFlore/Projets.eflore-projets

Compare Revisions

Ignore whitespace Rev 1260 → Rev 1261

/branches/v5.12-baouque/services/modules/0.1/cel/Images.php
60,7 → 60,7
if ($this->parametres['retour'] == self::MIME_JPEG) {
if (@$this->parametres['retour.tri'] == 'date') { // recherche la plus vieille image du CEL
$id_image_a_renvoyer = $this->obtenirIdPremiereImage();
} else {
} else {
$id_image_a_renvoyer = $this->obtenirIdImageAuHasard();
}
$resultat->corps = $this->recupererImageBinaire($id_image_a_renvoyer);
229,11 → 229,8
$numNom = $this->Bdd->proteger($this->ref_tax_demande[$refTax][0]);
 
$requete = 'SELECT ci.id_image AS id_image '.
'FROM cel_images AS ci '.
' LEFT JOIN cel_obs AS co '.
'ON (ci.ce_observation = co.id_observation) '.
'WHERE co.transmission = 1 '.
" AND co.nom_ret_nn IN ($numNom)";
' FROM cel_export AS co '.
" WHERE co.nom_ret_nn IN ($numNom)";
" AND co.nom_referentiel = ".$this->Bdd->proteger($refTax) . ' -- ' . __FILE__ . ':' . __LINE__;
 
$resultat = $this->Bdd->recupererTous($requete);
253,10 → 250,9
$numNom = $this->Bdd->proteger($this->ref_tax_demande[$refTax][0]);
$requete = 'SELECT ci.id_image AS id_image '.
'FROM cel_images AS ci'.
' LEFT JOIN cel_obs AS co '.
' LEFT JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
'WHERE co.transmission = 1 '.
" AND co.nom_ret_nn IN ($numNom) ".
"WHERE co.nom_ret_nn IN ($numNom) ".
' AND ci.date_prise_de_vue != "0000-00-00" '.
' AND co.nom_referentiel LIKE '.$this->Bdd->proteger($refTax.'%').' '.
' ORDER BY ci.date_prise_de_vue ASC '.
282,7 → 278,7
' nom_sel, nom_sel_nn, '.
' zone_geo, ce_zone_geo, lieudit, station, milieu '.
'FROM cel_images AS ci'.
' LEFT JOIN cel_obs AS co '.
' LEFT JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
'WHERE ci.id_image = '.$this->ressources[0].
' AND co.id_observation IS NOT NULL' . ' -- ' . __FILE__ . ':' . __LINE__;
304,19 → 300,21
' ci.id_image AS id_img, co.date_observation AS date '.
(isset($this->parametres['retour.champs']) ? ', '.$this->parametres['retour.champs'] : '').
'FROM cel_images AS ci'.
' LEFT JOIN cel_obs AS co '.
' LEFT JOIN cel_export AS co '.
' ON (ci.ce_observation = co.id_observation) '.
$this->formerRequeteConditions($numNomListe).' '.
'GROUP BY id_img '.
$this->formerRequeteTri().
"LIMIT $depart,$limite " . ' -- ' . __FILE__ . ':' . __LINE__;
 
echo $requete;exit;
$this->infosImages = $this->Bdd->recupererTous($requete);
}
 
private function formerRequeteConditions($numNomListe) {
$refTax = $this->parametres['referentiel'];
$where[] = " co.transmission = 1 AND co.nom_ret_nn IN ($numNomListe) ";
$where[] = " co.nom_ret_nn IN ($numNomListe) ";
// exclusion des noms à déterminer, douteux ou plantnet-mobile
$where[] = " (co.certitude not in ('aDeterminer', 'douteux', 'douteuse') OR certitude IS NULL) ";
$where[] = " co.nom_referentiel LIKE ".$this->Bdd->proteger($refTax."%").' ';
return ' WHERE '.implode(' AND ', $where);