48,7 → 48,6 |
|
public function consulter($ressources, $parametres) { |
$this->paramsFiltres = $this->filtrage->filtrerUrlParamsAppliImg(); |
$this->sql->setAppli(Sql::APPLI_IMG); |
$this->sql->setParametres($this->paramsFiltres); |
$this->sql->ajouterContraintes(); |
$this->sql->ajouterConstrainteAppliImg(); |
80,7 → 79,7 |
|
private function getIdImages() { |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_image '. |
'FROM del_image AS di '. |
'FROM v_del_image AS vdi '. |
$this->sql->getJoin(). |
'WHERE '.$this->sql->getWhere(). |
$this->sql->getGroupBy(). |
99,16 → 98,14 |
} |
|
private function getInfosImages() { |
$obsChamps = $this->sql->getAliasDesChamps($this->mappings['observations'], null, 'do'); |
$imgChamps = $this->sql->getAliasDesChamps($this->mappings['images'], null, 'di'); |
$obsChamps = $this->sql->getAliasDesChamps($this->mappings['observations']); |
$imgChamps = $this->sql->getAliasDesChamps($this->mappings['images']); |
$idImgsConcat = implode(',', $this->idsImagesOrdonnees); |
|
$requete = "SELECT $obsChamps, $imgChamps ". |
'FROM del_image AS di '. |
' LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) '. |
"WHERE di.id_image IN ($idImgsConcat) ". |
'FROM v_del_image '. |
"WHERE id_image IN ($idImgsConcat) ". |
'-- '.__FILE__.':'.__LINE__; |
//Debug::printr($requete); |
return $this->bdd->recupererTous($requete); |
} |
|
126,9 → 123,9 |
$image = array( |
'id_image' => $id, |
'binaire.href' => sprintf($urlImgTpl, $infos['id_image'], $imageFormat), |
'mots_cles_texte' => isset($infos['mots_cles_texte']) ? $infos['mots_cles_texte'] : null, |
'mots_cles_texte' => isset($infos['mots_cles_texte_img']) ? $infos['mots_cles_texte_img'] : null, |
); |
unset($infos['id_image'], $infos['mots_cles_texte']); |
unset($infos['id_image'], $infos['mots_cles_texte_img']); |
|
$obs_merged[$id] = $image; |
$obs_merged[$id]['observation'] = $infos; |