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