Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 986 → Rev 987

/trunk/services/modules/0.1/observations/ListeObservationsWidget.php
319,7 → 319,6
// comme avec implode (attention au fait que l'on concatène des % au début et à la fin)
foreach($mots_cles as $mot_cle) {
$requeteMotsCles = $this->proteger('%'.$mot_cle.'%');
$requeteMotsClesImg .= 'di.mots_cles_texte LIKE '.$requeteMotsCles.' AND ';
$requeteMotsClesObs .= 'dob.mots_cles_texte LIKE '.$requeteMotsCles.' AND ';
}
$requeteMotsClesImg = rtrim($requeteMotsClesImg, ' AND ');
340,12 → 339,21
* Chargement depuis la bdd de toutes les liaisons entre images et observations
* */
private function chargerObservations() {
$requete = 'SELECT distinct id_observation '.
/*$requete = 'SELECT DISTINCT id_observation '.
'FROM '.$this->gestionBdd->formaterTable('del_obs_image', 'dob').
$this->chargerClauseWhere().
' GROUP BY id_observation'.
//' ORDER BY '.$this->tri.' '.$this->directionTri.' '.
$this->gestionBdd->getLimitSql();
$this->gestionBdd->getLimitSql();*/
$requete = 'SELECT DISTINCT dob.id_observation '.
'FROM '.$this->gestionBdd->formaterTable('del_observation', 'dob').
'INNER JOIN '.$this->gestionBdd->formaterTable('del_obs_image', 'doi').
'ON doi.id_observation = dob.id_observation '.
$this->chargerClauseWhere().
' ORDER BY '.$this->tri.' '.$this->directionTri.' '.
$this->gestionBdd->getLimitSql();
return $this->bdd->recupererTous($requete);
}