231,11 → 231,11 |
$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 '. |
'FROM cel_images_export AS ci '. |
' 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 co.nom_referentiel = ".$this->Bdd->proteger($refTax) . ' -- ' . __FILE__ . ':' . __LINE__; |
|
$resultat = $this->Bdd->recupererTous($requete); |
254,11 → 254,11 |
$refTax = $this->parametres['referentiel']; |
$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 '. |
'FROM cel_images_export AS ci'. |
' 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 '. |
280,11 → 280,11 |
$requete = 'SELECT SQL_CALC_FOUND_ROWS '. |
' ci.id_image AS id_img, co.date_observation AS date, '. |
' co.id_observation AS id_obs, '. |
' ci.courriel_utilisateur AS utilisateur_courriel, '. |
' co.courriel_utilisateur AS utilisateur_courriel, '. |
' nom_sel, nom_sel_nn, '. |
' zone_geo, ce_zone_geo, lieudit, station, milieu '. |
'FROM cel_images AS ci'. |
' LEFT JOIN cel_obs AS co '. |
'FROM cel_images_export AS ci'. |
' 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__; |
305,8 → 305,8 |
' co.nom_sel, co.nom_sel_nn, '. |
' 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 '. |
'FROM cel_images_export AS ci'. |
' LEFT JOIN cel_export AS co '. |
' ON (ci.ce_observation = co.id_observation) '. |
$this->formerRequeteConditions($numNomListe).' '. |
'GROUP BY id_img '. |
318,10 → 318,9 |
|
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.mots_cles_texte not like '%aDeterminer%' AND co.mots_cles_texte not like '%plantnet-mobile%') OR co.mots_cles_texte IS null) "; |
$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); |
553,7 → 552,7 |
$and = $referentiel ? ' AND referentiel = ' . $this->Bdd->proteger($referentiel) : ''; |
|
$requete = 'SELECT referentiel, ce_image as id_img, organe '. |
'FROM tb_del.del_image_top '. |
'FROM tb_del_test.del_image_top '. |
'WHERE nn = '. $this->Bdd->proteger($nn) . $and . ' -- ' . __FILE__ . ':' . __LINE__; |
|
$this->infosImages = $this->Bdd->recupererTous($requete); |