Subversion Repositories eFlore/Applications.del

Rev

Rev 1863 | Rev 1881 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1863 Rev 1871
Line 46... Line 46...
46 
		$this->mappings['images'] = $this->conteneur->getParametreTableau('images.mapping');
 46 
		$this->mappings['images'] = $this->conteneur->getParametreTableau('images.mapping');
47 
	}
 47 
	}
Line 48... Line 48...
48 
 
 48 
 
49 
	public function consulter($ressources, $parametres) {
 49 
	public function consulter($ressources, $parametres) {
- 
 
 50 
		$this->paramsFiltres = $this->filtrage->filtrerUrlParamsAppliImg();
50 
		$this->paramsFiltres = $this->filtrage->filtrerUrlParamsAppliImg();
 51 
		$this->sql->setAppli(Sql::APPLI_IMG);
51 
		$this->sql->setParametres($this->paramsFiltres);
 52 
		$this->sql->setParametres($this->paramsFiltres);
52 
		$this->sql->ajouterContraintes();
 53 
		$this->sql->ajouterContraintes();
53 
		$this->sql->ajouterConstrainteAppliImg();
 54 
		$this->sql->ajouterConstrainteAppliImg();
Line 77... Line 78...
77 
		return $resultat;
 78 
		return $resultat;
78 
	}
 79 
	}
Line 79... Line 80...
79 
 
 80 
 
80 
	private function getIdImages() {
 81 
	private function getIdImages() {
81 
		$requete = 'SELECT SQL_CALC_FOUND_ROWS id_image '.
 82 
		$requete = 'SELECT SQL_CALC_FOUND_ROWS id_image '.
82 
			'FROM v_del_image AS vdi '.
 83 
			'FROM del_image AS di '.
83 
			$this->sql->getJoin().
 84 
			$this->sql->getJoin().
84 
			'WHERE '.$this->sql->getWhere().
 85 
			'WHERE '.$this->sql->getWhere().
85 
			$this->sql->getGroupBy().
 86 
			$this->sql->getGroupBy().
86 
			$this->sql->getOrderBy().
 87 
			$this->sql->getOrderBy().
Line 96... Line 97...
96 
		}
 97 
		}
97 
		return $idImgs;
 98 
		return $idImgs;
98 
	}
 99 
	}
Line 99... Line 100...
99 
 
 100 
 
100 
	private function getInfosImages() {
 101 
	private function getInfosImages() {
101 
		$obsChamps = $this->sql->getAliasDesChamps($this->mappings['observations']);
 102 
		$obsChamps = $this->sql->getAliasDesChamps($this->mappings['observations'], null, 'do');
102 
		$imgChamps = $this->sql->getAliasDesChamps($this->mappings['images']);
 103 
		$imgChamps = $this->sql->getAliasDesChamps($this->mappings['images'], null, 'di');
Line 103... Line 104...
103 
		$idImgsConcat = implode(',', $this->idsImagesOrdonnees);
 104 
		$idImgsConcat = implode(',', $this->idsImagesOrdonnees);
104 
 
 105 
 
- 
 
 106 
		$requete = "SELECT $obsChamps, $imgChamps ".
105 
		$requete = "SELECT $obsChamps, $imgChamps ".
 107 
			'FROM del_image AS di '.
106 
			'FROM v_del_image '.
 108 
			'	LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) '.
- 
 
 109 
			"WHERE di.id_image IN ($idImgsConcat) ".
107 
			"WHERE id_image IN ($idImgsConcat) ".
 110 
			'-- '.__FILE__.':'.__LINE__;
108 
			'-- '.__FILE__.':'.__LINE__;
 111 
		//Debug::printr($requete);
Line 109... Line 112...
109 
		return $this->bdd->recupererTous($requete);
 112 
		return $this->bdd->recupererTous($requete);
110 
	}
 113 
	}
Line 121... Line 124...
121 
			// et celui indexé par simple id_image qui est fort utile pour mapVotesToImages()
 124 
			// et celui indexé par simple id_image qui est fort utile pour mapVotesToImages()
122 
			// mais tout deux partage leur référence à "protocole"
 125 
			// mais tout deux partage leur référence à "protocole"
123 
			$image = array(
 126 
			$image = array(
124 
				'id_image' => $id,
 127 
				'id_image' => $id,
125 
				'binaire.href' => sprintf($urlImgTpl, $infos['id_image'], $imageFormat),
 128 
				'binaire.href' => sprintf($urlImgTpl, $infos['id_image'], $imageFormat),
126 
				'mots_cles_texte' => isset($infos['mots_cles_texte_img']) ? $infos['mots_cles_texte_img'] : null,
 129 
				'mots_cles_texte' => isset($infos['mots_cles_texte']) ? $infos['mots_cles_texte'] : null,
127 
			);
 130 
			);
128 
			unset($infos['id_image'], $infos['mots_cles_texte_img']);
 131 
			unset($infos['id_image'], $infos['mots_cles_texte']);
Line 129... Line 132...
129 
 
 132 
 
130 
			$obs_merged[$id] = $image;
 133 
			$obs_merged[$id] = $image;
131 
			$obs_merged[$id]['observation'] = $infos;
 134 
			$obs_merged[$id]['observation'] = $infos;
132 
			$obs_merged[$id]['protocoles_votes'] = array();
 135 
			$obs_merged[$id]['protocoles_votes'] = array();