260,7 → 260,7 |
'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.'%').' '. |
' AND co.nom_referentiel = '.$this->Bdd->proteger($refTax).' '. |
' ORDER BY ci.date_prise_de_vue ASC '. |
'LIMIT 1' . ' -- ' . __FILE__ . ':' . __LINE__; |
|
306,11 → 306,10 |
' ci.id_image AS id_img, co.date_observation AS date '. |
(isset($this->parametres['retour.champs']) ? ', '.$this->parametres['retour.champs'] : ''). |
'FROM cel_images_export AS ci'. |
' LEFT JOIN cel_export AS co '. |
' JOIN cel_export AS co '. |
' ON (ci.ce_observation = co.id_observation) '. |
$this->formerRequeteConditions($numNomListe).' '. |
'GROUP BY id_img '. |
$this->formerRequeteTri(). |
$this->formerRequeteTri(). |
"LIMIT $depart,$limite " . ' -- ' . __FILE__ . ':' . __LINE__; |
|
$this->infosImages = $this->Bdd->recupererTous($requete); |
319,9 → 318,7 |
private function formerRequeteConditions($numNomListe) { |
$refTax = $this->parametres['referentiel']; |
$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.nom_referentiel LIKE ".$this->Bdd->proteger($refTax."%").' '; |
$where[] = " co.nom_referentiel = ".$this->Bdd->proteger($refTax).' '; |
|
return ' WHERE '.implode(' AND ', $where); |
} |
535,7 → 532,7 |
if ($this->avoirContenu($infos['zone_geo'])) { |
$commune[] = $infos['zone_geo']; |
} |
if (isset($infos['ce_zone_geo']) && $this->avoirContenu($infos['ce_zone_geo']) && $infos['ce_zone_geo'] != 'INSEE-C:') { |
if (isset($infos['ce_zone_geo']) && $this->avoirContenu($infos['ce_zone_geo']) && $infos['ce_zone_geo'] != '') { |
$commune[] = '('.substr(str_replace('INSEE-C:','',$infos['ce_zone_geo']), 0, 2).')'; |
} |
return implode(' ', $commune); |
552,7 → 549,7 |
$and = $referentiel ? ' AND referentiel = ' . $this->Bdd->proteger($referentiel) : ''; |
|
$requete = 'SELECT referentiel, ce_image as id_img, organe '. |
'FROM tb_del_test.del_image_top '. |
'FROM tb_del.del_image_top '. |
'WHERE nn = '. $this->Bdd->proteger($nn) . $and . ' -- ' . __FILE__ . ':' . __LINE__; |
|
$this->infosImages = $this->Bdd->recupererTous($requete); |