| /branches/v1.6-azote/services/bibliotheque/Sql.php |
|---|
| 113,7 → 113,7 |
| if (isset($this->requete['where']['OR_SOUS_REQUETE']) && count($this->requete['where']['OR_SOUS_REQUETE']) > 0) { |
| $clauseWhereSousRequete = implode(' OR ', $this->requete['where']['OR_SOUS_REQUETE']); |
| $sousRequete = 'di.ce_observation IN '. |
| "(SELECT DISTINCT id_observation FROM del_observation AS do WHERE $clauseWhereSousRequete ) "; |
| "(SELECT id_observation FROM del_observation AS do WHERE $clauseWhereSousRequete ) "; |
| $this->requete['where']['OR'][] = "( $sousRequete )"; |
| unset($this->requete['join']['LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) ']); |
| } |
| 524,7 → 524,7 |
| foreach ($tags as $tag) { |
| $tagMotif = $this->bdd->proteger("%$tag%"); |
| if ($this->etreAppliImg()) { |
| $sousRequete = 'SELECT DISTINCT id_observation '. |
| $sousRequete = 'SELECT id_observation '. |
| 'FROM del_observation '. |
| "WHERE mots_cles_texte LIKE $tagMotif "; |
| $sql = " (di.mots_cles_texte LIKE $tagMotif OR di.id_image IN ($sousRequete) ) "; |
| /branches/v1.6-azote/services/modules/0.1/observations/ListeObservations.php |
|---|
| 115,8 → 115,7 |
| */ |
| private function getInfosObs() { |
| $idsObsConcat = implode(',', $this->idsObsOrdonnees); |
| // TODO : bizarement MYSQL 5.6 retourne plusieurs fois les mêmes enregistrements d'où le DISTINCT (normalement inutile) |
| $requete = "SELECT DISTINCT id_observation, nom_sel AS `determination.ns`, nt AS `determination.nt`, ". |
| $requete = "SELECT id_observation, nom_sel AS `determination.ns`, nt AS `determination.nt`, ". |
| 'nom_sel_nn AS `determination.nn`, famille AS `determination.famille`, '. |
| 'nom_referentiel AS `determination.referentiel`, ce_zone_geo AS id_zone_geo, '. |
| 'zone_geo, lieudit, station, milieu, date_observation, do.mots_cles_texte, '. |
| /branches/v1.6-azote/services/modules/0.1/observations/ObservationDetails.php |
|---|
| 85,8 → 85,7 |
| "IFNULL(du.nom, do.nom_utilisateur) AS `auteur.nom`", |
| "IFNULL(du.courriel, do.courriel_utilisateur) AS `auteur.courriel`")); |
| // TODO : bizarement MYSQL 5.6 retourne plusieurs fois les mêmes enregistrements d'où le DISTINCT (normalement inutile) |
| $requete = "SELECT DISTINCT $obsChamps, $imgChamps, $annuaireChamps ". |
| $requete = "SELECT $obsChamps, $imgChamps, $annuaireChamps ". |
| "FROM del_observation AS do ". |
| " LEFT JOIN del_image AS di ON (do.id_observation = di.ce_observation) ". |
| " LEFT JOIN del_utilisateur AS du ON (do.ce_utilisateur = du.id_utilisateur) ". |