338,9 → 338,9 |
|
// Construction de la requête |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' co.*, '. |
' ci.id_image, ci.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '. |
' co.mots_cles_texte AS mots_cles_texte_images_obs, ci.commentaire, note_qualite, nom_referentiel '. |
'FROM cel_export_total AS co LEFT JOIN photo AS ci ON (co.id_observation = ci.ce_observation) '. |
' ci.id_image, co.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '. |
' co.mots_cles_texte AS mots_cles_texte_images_obs, "" as commentaire, "" as note_qualite, nom_referentiel '. |
'FROM cel_export_total AS co LEFT JOIN cel_images_export AS ci ON (co.id_observation = ci.ce_observation) '. |
'WHERE co.transmission = 1 '. |
' AND co.ce_utilisateur = ci.ce_utilisateur '. |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'ci.date_creation DESC').' '. |
380,7 → 380,7 |
' ci.id_image, co.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '. |
' co.mots_cles_texte AS mots_cles_texte_obs, ci.commentaire AS commentaire_img, note_qualite, nom_referentiel, '. |
' co.commentaire AS commentaire_obs '. |
'FROM photo AS ci '. |
'FROM cel_images_export AS ci '. |
' LEFT JOIN cel_export_total AS co '. |
' ON (ci.ce_observation = co.id_observation) '. |
(($this->etreFluxAdmin()) ? '' : 'WHERE co.transmission = 1 '). |
435,7 → 435,7 |
// Première sous requete pour que le limite se fasse d'abord sur les images |
// et pas la jointure de toutes les tables |
$sous_requete = 'SELECT c.* '. |
'FROM cel_images c '. |
'FROM photo c '. |
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_export_total b ON c.ce_observation = b.id_observation AND b.transmission = 1 '); |
$sous_requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'c.date_creation DESC').' '. |
"LIMIT $this->start,$this->limit "; |
442,7 → 442,7 |
|
// Construction de la requête |
$requete = 'SELECT *, b.mots_cles_texte AS mots_cles_texte_obs, c.mots_cles_texte AS mots_cles_texte_images, '. |
' b.commentaire AS commentaire_obs, c.commentaire AS commentaire_img, nom_referentiel '. |
' b.commentaire AS commentaire_obs, "" AS commentaire_img, nom_referentiel '. |
'FROM ('.$sous_requete.') AS c '. |
' INNER JOIN cel_export_total AS b '. |
' ON (c.ce_observation = b.id_observation) AND b.ce_utilisateur = c.ce_utilisateur '; |
453,8 → 453,8 |
private function creerRequeteAvecParametres() { |
// Construction de la requête |
$requete = 'SELECT *, b.mots_cles_texte as mots_cles_texte_obs, c.mots_cles_texte as mots_cles_texte_images, '. |
' b.commentaire as commentaire_obs, c.commentaire as commentaire_img, nom_referentiel '. |
'FROM cel_images AS c '. |
' b.commentaire as commentaire_obs, "" as commentaire_img, nom_referentiel '. |
'FROM photo AS c '. |
' INNER JOIN cel_export_total AS b '. |
' ON (c.ce_observation = b.id_observation) '. |
'WHERE b.ce_utilisateur = c.ce_utilisateur '. |
588,9 → 588,9 |
' OR '. |
'b.ce_zone_geo LIKE "'.$chaine_requete.'%" '. |
' OR '. |
'c.ce_utilisateur LIKE "'.$chaine_requete.'%" '. |
'c.user_id LIKE "'.$chaine_requete.'%" '. |
' OR '. |
'c.courriel_utilisateur LIKE "'.$chaine_requete.'%" '. |
'c.user_mail LIKE "'.$chaine_requete.'%" '. |
' OR '. |
'b.mots_cles_texte LIKE "'.$chaine_requete.'%" '. |
' OR '. |