/trunk/jrest/lib/GestionObservation.php |
---|
297,19 → 297,8 |
$msg = "Erreur de suppression d'une liste d'observations : $resultat_suppression_observations"; |
$this->logger('CEL_bugs', $msg); |
} else { |
$requete = 'DELETE FROM cel_obs_images '. |
"WHERE id_observation IN ($chaine_ids_obs) ". |
' -- ' . __FILE__ . ':' . __LINE__; |
// TODO [jpm] : pourquoi on supprime pas les images si on supprime les obs ? |
$resultat_suppression_liens = Cel::db()->executer($requete); |
if ($resultat_suppression_liens === false) { |
$msg = "Erreur de suppression d'une liste de liaison entre observations et images : $requete"; |
$this->logger('CEL_bugs', $msg); |
} else { |
$retour = true; |
} |
$gestion_mots_cles = new GestionMotsClesChemin($this->config, 'obs'); |
$resultat_suppression_mots_cles = $gestion_mots_cles->supprimerToutesLiaisonsPourIdsElementsLies($ids_obs_non_protegees); |
/trunk/jrest/lib/GestionImage.php |
---|
238,15 → 238,6 |
$this->logger($message); |
} |
$requete = 'DELETE FROM cel_obs_images '. |
"WHERE id_image in ($chaine_ids_images) ". |
' -- '.__FILE__.' : '.__LINE__; |
$resultat_suppression_lien_images_obs = Cel::db()->executer($requete); |
if ($resultat_suppression_lien_images_obs === false) { |
$message = "Erreur lors de la suppression des observations associées à l'image" ; |
$this->logger($message); |
} |
$gestion_mots_cles = new GestionMotsClesChemin($this->config, 'images'); |
$resultat_suppression_lien_images_mots_cles = $gestion_mots_cles->supprimerToutesLiaisonsPourIdsElementsLies($ids_images_non_protegees); |
if (!$resultat_suppression_lien_images_mots_cles === false) { |
/trunk/jrest/lib/RechercheImage.php |
---|
104,50 → 104,39 |
} |
private function fabriquerRequeteJointureObs() { |
$requete_jointure_observations = 'FROM cel_images ci '. |
'LEFT JOIN cel_obs_images coi '. |
'ON coi.id_image = ci.id_image '. |
$requete = 'FROM cel_images ci '. |
'LEFT JOIN cel_obs co '. |
'ON coi.id_observation = co.id_observation '. |
'ON ci.ce_observation = co.id_observation '. |
'WHERE 1 '; |
return $requete_jointure_observations; |
return $requete; |
} |
public function obtenirInformationsObservationsAssociees($id_utilisateur, $id_image) { |
$requete = 'SELECT ce_observation FROM cel_images WHERE id_image = '.$id_image; |
$resultats = Cel::db()->requeter($requete); |
$requete_table_liaison = 'SELECT id_observation FROM cel_obs_images WHERE id_image = '.$id_image; |
$idsObsListe = array(); |
foreach ($resultats as $liaison) { |
$idsObsListe[] = $liaison['ce_observation']; |
} |
$ids_obs = implode(',', $idsObsListe); |
$resultats_liaisons_images = Cel::db()->requeter($requete_table_liaison); |
$ids_obs = ''; |
foreach($resultats_liaisons_images as $liaison) { |
$ids_obs .= $liaison['id_observation'].","; |
} |
$ids_obs = rtrim($ids_obs,','); |
$infos_obs = ''; |
if(trim($ids_obs) != '') { |
$requete_obs_liees = 'SELECT * FROM cel_obs WHERE id_observation IN ('.$ids_obs.') AND ce_utilisateur ="'.$id_utilisateur.'"'; |
$resultat_obs_liees = Cel::db()->requeter($requete_obs_liees); |
$requete = 'SELECT * FROM cel_obs WHERE id_observation IN ('.$ids_obs.') AND ce_utilisateur = "'.$id_utilisateur.'"'; |
$resultats = Cel::db()->requeter($requete); |
foreach($resultat_obs_liees as $obs_liee) |
{ |
foreach ($resultats as $obs_liee) { |
$infos_obs .= $obs_liee['ordre'].'#'.$obs_liee['nom_sel'].'#'.$obs_liee['transmission'].';;' ; |
} |
} |
return $infos_obs; |
} |
private function fabriquerSousRequeteRecherche($id_utilisateur, $criteres) { |
$sous_requete = ' AND '; |
foreach($criteres as $nom => $valeur) |
{ |
foreach($criteres as $nom => $valeur) { |
if($valeur == null || trim($nom) == "" || trim($valeur) == "") { |
continue; |
} |
172,8 → 161,7 |
case "commentaire": |
$mots_comment_liste = explode(" " , $valeur) ; |
foreach($mots_comment_liste as $mot_comment) |
{ |
foreach($mots_comment_liste as $mot_comment) { |
$mot_comment = trim($mot_comment) ; |
$sous_requete .= 'ci.'.$nom.' LIKE '.Cel::db()->proteger('%'.$mot_comment.'%') ; |
$sous_requete .= ' AND ' ; |
246,9 → 234,7 |
break; |
} |
} |
$sous_requete = rtrim($sous_requete,' AND '); |
return $sous_requete; |
} |
/trunk/jrest/lib/FormateurGroupeColonne.php |
---|
453,7 → 453,7 |
if(!$obsids) return; |
$rec = Cel::db()->requeter( |
sprintf("SELECT o.id_observation, GROUP_CONCAT(nom_original ORDER BY nom_original ASC SEPARATOR '%s') AS i " . |
"FROM cel_images i LEFT JOIN cel_obs_images oi ON (i.id_image = oi.id_image) LEFT JOIN cel_obs o ON (oi.id_observation = o.id_observation) " . |
"FROM cel_images i LEFT JOIN cel_obs o ON (i.ce_observation = o.id_observation) " . |
"WHERE o.ce_utilisateur = %d AND o.id_observation IN (%s) " . |
"GROUP BY id_observation", |
SEPARATEUR_IMAGES, |
471,10 → 471,12 |
return self::$cache['getImages'][$obs['id_observation']]; |
$rec = Cel::db()->requeter( |
sprintf("SELECT GROUP_CONCAT(nom_original ORDER BY nom_original ASC SEPARATOR '%s') AS i FROM cel_images i" |
." LEFT JOIN cel_obs_images oi ON (i.id_image = oi.id_image)" |
." LEFT JOIN cel_obs o ON (oi.id_observation = o.id_observation)" |
." WHERE o.ce_utilisateur = %d AND o.id_observation = %d LIMIT 1", |
sprintf("SELECT GROUP_CONCAT(nom_original ORDER BY nom_original ASC SEPARATOR '%s') AS i ". |
"FROM cel_images i ". |
" LEFT JOIN cel_obs o ON (i.ce_observation = o.id_observation) ". |
"WHERE o.ce_utilisateur = %d ". |
" AND o.id_observation = %d ". |
'LIMIT 1', |
SEPARATEUR_IMAGES, |
$id_utilisateur, |
$obs['id_observation'])); |