46,10 → 46,10 |
if (is_null($retour)) { |
$info = 'Un problème est survenu : '.print_r($this->messages, true); |
$this->envoyer($info); |
} else if ($retour['type'] == 'jsonVar') { |
} else if (isset($retour['type']) && $retour['type'] == 'jsonVar') { |
|
$this->envoyerJsonVar($retour['variable_js'], $retour['donnees']); |
} else if ($retour['type'] == 'jsonP') { |
} else if (isset($retour['type']) && $retour['type'] == 'jsonP') { |
$this->envoyerJsonp($retour['donnees']); |
} else { |
$this->envoyerJson($retour); |
61,10 → 61,10 |
*/ |
public function getStations($params) { |
$json = null; |
$requete = 'SELECT sector, x_utm, y_utm, wgs84_latitude AS coord_x, wgs84_longitude AS coord_y '. |
'FROM cel_inventory AS i '. |
' LEFT JOIN locations AS l '. |
' ON (l.name = i.location AND l.code = i.id_location) '. |
$requete = 'SELECT utm_secteur, utm_x, utm_y, wgs84_latitude AS latitude, wgs84_longitude AS longitude '. |
'FROM cel_obs AS co '. |
' LEFT JOIN cel_zones_geo AS l '. |
' ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) '. |
"WHERE transmission = '1' ". |
$this->construireWhereDept(). |
$this->construireWhereCommune(). |
105,13 → 105,13 |
$stations = array(); |
if ($resultats !== false) { |
foreach ($resultats as $enrg) { |
if ($enrg['coord_x'] != null && $enrg['coord_y'] != null) { |
$id = $enrg['coord_x'].'-'.$enrg['coord_y']; |
if ($enrg['latitude'] != null && $enrg['longitude'] != null) { |
$id = $enrg['latitude'].'-'.$enrg['longitude']; |
if (!isset($stations[$id])) { |
$enrg['id'] = 'UTM:'.$enrg['x_utm'].'-'.$enrg['y_utm'].'-'.$enrg['sector']; |
unset($enrg['x_utm']); |
unset($enrg['y_utm']); |
unset($enrg['sector']); |
$enrg['id'] = 'UTM:'.$enrg['utm_x'].'-'.$enrg['utm_y'].'-'.$enrg['utm_secteur']; |
unset($enrg['utm_x']); |
unset($enrg['utm_y']); |
unset($enrg['utm_secteur']); |
$stations[$id] = $enrg; |
$stations[$id]['nbre'] = 1; |
} else { |
131,12 → 131,13 |
$resultats = array(); |
$total = 0; |
if (!$this->etreNull($this->parametres['station'])) { |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id, identifiant, nom_sel, nom_ret, num_nom_sel, num_nom_ret, num_taxon, famille, '. |
' lieudit, location, date_observation, milieu, commentaire, '. |
' sector, x_utm, y_utm, insee_code, date_transmission '. |
'FROM cel_inventory AS i '. |
' LEFT JOIN locations AS l '. |
" ON (l.name = i.location AND l.code = i.id_location) ". |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, '. |
' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, nt, famille, '. |
' lieudit, zone_geo, date_observation, milieu, commentaire, '. |
' utm_secteur, utm_x, utm_y, id_zone_geo, date_transmission '. |
'FROM cel_obs AS co '. |
' LEFT JOIN cel_zones_geo AS l '. |
" ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) ". |
"WHERE transmission = '1' ". |
$this->construireWhereCoordonnees(). |
$this->construireWhereUtilisateur(). |
158,34 → 159,30 |
// Post-traitement |
$observations = $this->traiterObservations($resultats, $total); |
$observations = $this->ajouterImagesAuxObs($observations); |
$observations = $this->ajouterAuteursAuxObs($observations); |
$observations = $this->supprimerIdDesObs($observations); |
return $observations; |
} |
|
private function traiterObservations($donnees, $total) { |
$observations = array('commune' => '', 'observations' => array(), 'observateurs' => array()); |
$observations = array('commune' => '', 'observations' => array()); |
$observations['total'] = (isset($total)) ? $total : 0; |
if (is_array($donnees) && count($donnees) > 0) { |
foreach ($donnees as $donnee) { |
$observation = array(); |
$observation['idObs'] = $donnee->id; |
$observation['nn'] = $this->etreNull($donnee->num_nom_sel) ? null : $donnee->num_nom_sel; |
$observation['idObs'] = $donnee->id_observation; |
$observation['nn'] = $this->etreNull($donnee->nom_sel_nn) ? null : $donnee->nom_sel_nn; |
$observation['nomSci'] = $this->nettoyerTexte($donnee->nom_sel); |
$observation['date'] = $this->formaterDate($donnee->date_observation, '%d/%m/%Y'); |
$observation['datePubli'] = $this->formaterDate($donnee->date_transmission); |
$observation['lieu'] = $this->traiterLieu($donnee); |
$observation['observateur'] = $donnee->identifiant; |
$observation['urlEflore'] = $this->getUrlEflore($donnee->num_nom_sel); |
$observation['observateur'] = $donnee->courriel_utilisateur; |
$observation['observateurId'] = $donnee->ce_utilisateur; |
$observation['urlEflore'] = $this->getUrlEflore($donnee->nom_sel_nn); |
|
if (isset($donnee->location)) { |
$observations['commune'] = $this->nettoyerTexte($donnee->location); |
if (isset($donnee->zone_geo)) { |
$observations['commune'] = $this->nettoyerTexte($donnee->zone_geo); |
} |
$observations['observations'][$donnee->id] = $observation; |
|
if (! array_key_exists($donnee->identifiant, $observations['observateurs'])) { |
$observations['observateurs'][$donnee->identifiant] = $donnee->identifiant; |
} |
$observations['observations'][$donnee->id_observation] = $observation; |
} |
} |
return $observations; |
242,24 → 239,14 |
private function ajouterImagesAuxObs($observations) { |
$images = $this->chargerImages(array_keys($observations['observations'])); |
foreach ($observations['observations'] as $id => $infos) { |
$infos['images'] = $images[$id]; |
if(isset($images[$id])) { |
$infos['images'] = $images[$id]; |
} |
$observations['observations'][$id] = $infos; |
} |
return $observations; |
} |
|
private function ajouterAuteursAuxObs($observations) { |
$observateurs = $this->recupererUtilisateursIdentite(array_keys($observations['observateurs'])); |
unset($observations['observateurs']); |
foreach ($observations['observations'] as $id => $infos) { |
$courriel = $infos['observateur']; |
$infos['observateur'] = $observateurs[$courriel]['intitule']; |
$infos['observateurId'] = $observateurs[$courriel]['id']; |
$observations['observations'][$id] = $infos; |
} |
return $observations; |
} |
|
private function supprimerIdDesObs($observations) { |
// Le tableau de sortie ne doit pas avoir les id des obs en clé car sinon Jquery Template ne fonctionne pas |
$observationSansId = $observations; |
276,10 → 263,10 |
public function getTaxons($params) { |
$json = null; |
|
$requete = 'SELECT SQL_CALC_FOUND_ROWS DISTINCT nom_ret, num_nom_ret, num_taxon, famille '. |
'FROM cel_inventory AS i '. |
' LEFT JOIN locations AS l '. |
' ON (l.name = i.location AND l.code = i.id_location) '. |
$requete = 'SELECT SQL_CALC_FOUND_ROWS DISTINCT nom_ret, nom_ret_nn, nt, famille '. |
'FROM cel_obs AS co '. |
' LEFT JOIN cel_zones_geo AS l '. |
' ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) '. |
"WHERE transmission = '1' ". |
" AND nom_ret != '' ". |
$this->construireWhereDept(). |
294,6 → 281,7 |
'ORDER BY nom_ret ASC '. |
"LIMIT {$this->start},{$this->limit} "; |
//$this->debug[] = $requete; |
//die($requete); |
$resultats = $this->requeter($requete, self::SQL_RETOUR_COMPLET, self::SQL_MODE_OBJET); |
|
$requete = 'SELECT FOUND_ROWS()'; |
309,13 → 297,13 |
$taxons = array(); |
if (is_array($donnees) && count($donnees) > 0) { |
foreach ($donnees as $donnee) { |
if (!isset($taxons[$donnee->num_taxon]) && ! $this->etreNull($donnee->nom_ret)) { |
if (!isset($taxons[$donnee->nt]) && ! $this->etreNull($donnee->nom_ret)) { |
$taxon = array(); |
$taxon['nn'] = $donnee->num_nom_ret; |
$taxon['nt'] = $donnee->num_taxon; |
$taxon['nn'] = $donnee->nom_ret_nn; |
$taxon['nt'] = $donnee->nt; |
$taxon['nom'] = $this->nettoyerTexte($donnee->nom_ret); |
$taxon['famille'] = $this->nettoyerTexte($donnee->famille); |
$taxons[$donnee->num_taxon] = $taxon; |
$taxons[$donnee->nt] = $taxon; |
} |
} |
} |
330,15 → 318,15 |
if (isset($type)) { |
if ($type == 'UTM') { |
$secteur = $this->proteger($secteur); |
$x_utm = $this->proteger($x_utm); |
$y_utm = $this->proteger($y_utm); |
$utm_x = $this->proteger($utm_x); |
$utm_y = $this->proteger($utm_y); |
|
$sql = " AND (sector = $secteur AND x_utm = $x_utm AND y_utm = $y_utm ) "; |
$sql = " AND (utm_secteur = $secteur AND utm_x = $utm_x AND utm_y = $utm_y ) "; |
} else if ($type == 'LngLat') { |
$coord_x = $this->proteger($coord_x); |
$coord_y = $this->proteger($coord_y); |
$latitude = $this->proteger($latitude); |
$longitude = $this->proteger($longitude); |
|
$sql = " AND (coord_x = $coord_x AND coord_y = $coord_y ) "; |
$sql = " AND (latitude = $latitude AND longitude = $longitude ) "; |
} |
} |
return $sql; |
355,7 → 343,7 |
$sql = " AND (commentaire LIKE $commentaire OR ($sql)) "; |
break; |
case 'observation' : |
$sql = " AND commentaire LIKE $commentaire "; |
$sql = " AND co.commentaire LIKE $commentaire "; |
break; |
case 'photo' : |
$sql = ' AND '.$this->obtenirConditionPourCommentaires($commentaire).' '; |
367,7 → 355,7 |
$sql = ' AND '.$this->obtenirConditionPourCommentaireUtilisateur($commentaire).' '; |
break; |
default: |
$sql = " AND commentaire LIKE $commentaire "; |
$sql = " AND co.commentaire LIKE $commentaire "; |
} |
} |
return $sql; |
505,21 → 493,22 |
*/ |
private function obtenirObsLieesImg($type, $param) { |
// Construction de la requête |
$requete = 'SELECT DISTINCT coi_ce_observation AS ordre, coi_ce_utilisateur AS utilisateur '. |
'FROM cel_images '. |
' LEFT JOIN cel_obs_images '. |
' ON (ci_id_image = coi_ce_image) '. |
' LEFT JOIN cel_inventory AS i '. |
' ON (coi_ce_utilisateur = i.identifiant AND coi_ce_observation = i.ordre) '. |
$requete = 'SELECT DISTINCT id_observation AS id_obs, ce_utilisateur AS utilisateur '. |
'FROM cel_images ci'. |
' LEFT JOIN cel_obs_images coi '. |
' ON (coi.id_image = ci.id_image) '. |
' LEFT JOIN cel_obs AS co '. |
' ON coi.id_observation = co.id_observation '. |
' LEFT JOIN locations AS l '. |
' ON (l.name = i.location AND l.code = i.id_location) '. |
' ON (l.nom = co.zone_geo AND l.id_zone_geo = co.ce_zone_geo) '. |
"WHERE transmission = '1' ". |
($type == 'date.photo' ? " AND (ci_meta_date_time LIKE ".str_replace('-', ':', $param)." OR ci_meta_date LIKE $param) " : ''). |
($type == 'date.ajout' ? " AND ci_meta_date_ajout LIKE $param " : ''). |
($type == 'date.liaison' ? " AND coi_date_liaison LIKE $param " : ''). |
($type == 'commentaire.meta' ? " AND ci_meta_comment LIKE $param " : ''). |
($type == 'commentaire.utilisateur' ? " AND ci_meta_user_comment LIKE $param " : ''). |
($type == 'commentaire.*' ? " AND (ci_meta_comment LIKE $param OR ci_meta_user_comment LIKE $param) " : ''). |
($type == 'date.photo' ? " AND (date_prise_de_vue LIKE ".str_replace('-', ':', $param).") " : ''). |
($type == 'date.ajout' ? " AND date_creation LIKE $param " : ''). |
($type == 'date.liaison' ? " AND date_liaison LIKE $param " : ''). |
// TODO: recherche sur le xml |
//($type == 'commentaire.meta' ? " AND ci.commentaire LIKE $param " : ''). |
($type == 'commentaire.utilisateur' ? " AND ci.commentaire LIKE $param " : ''). |
($type == 'commentaire.*' ? " AND (ci.commentaire LIKE $param) " : ''). |
$this->construireWhereCoordonnees(). |
$this->construireWhereDept(). |
$this->construireWhereCommune(). |
538,12 → 527,12 |
$observations = array(); |
foreach ($resultats as $occurence) { |
$utilisateur = $occurence['utilisateur']; |
$ordre = $occurence['ordre']; |
$id_obs = $occurence['id_obs']; |
if (!array_key_exists($utilisateur, $observations)) { |
$observations[$utilisateur] = array(); |
} |
if (!array_key_exists($ordre, $observations[$utilisateur])) { |
$observations[$utilisateur][$ordre] = $ordre; |
if (!array_key_exists($id_obs, $observations[$utilisateur])) { |
$observations[$utilisateur][$id_obs] = $id_obs; |
} |
} |
} |
554,9 → 543,9 |
$sql = ''; |
if ($observations != null) { |
// Pré-construction du where de la requête |
$tpl_where = "(identifiant = '%s' AND ordre IN (%s))"; |
foreach ($observations as $utilisateur => $ordres) { |
$morceaux_requete[] = sprintf($tpl_where, $utilisateur, implode(',', $ordres)); |
$tpl_where = "(id_observation IN (%s))"; |
foreach ($observations as $utilisateur => $ids_obs) { |
$morceaux_requete[] = sprintf($tpl_where, implode(',', $ids_obs)); |
} |
if (count($morceaux_requete) > 0) { |
$sql = implode(" \nOR ", $morceaux_requete); |
563,7 → 552,7 |
} |
} else { |
// Nous voulons que la requête ne retourne rien |
$sql = "identifiant = '' AND ordre = ''"; |
$sql = "id_observation = ''"; |
} |
$sql = " $operateur ($sql) "; |
return $sql; |
574,8 → 563,12 |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (isset($dept) && !$this->etreNull($dept)) { |
$dept = $this->traiterValeursMultiples($dept); |
$sql = " AND code IN ($dept) "; |
$valeurs_a_proteger = explode(',',trim($dept)); |
foreach ($valeurs_a_proteger as $valeur) { |
$valeurs_protegees[] = '(ce_zone_geo LIKE '.$this->bdd->quote('INSEE-C:'.$valeur.'%').') '; |
} |
$valeurs = implode(' OR ', $valeurs_protegees); |
$sql = " AND ($valeurs) "; |
} |
return $sql; |
} |
586,7 → 579,7 |
extract($this->parametres); |
if (isset($commune) && !$this->etreNull($commune)) { |
$commune = $this->proteger($commune); |
$sql = " AND location LIKE $commune "; |
$sql = " AND zone_geo LIKE $commune "; |
} |
return $sql; |
} |
598,7 → 591,7 |
extract($this->parametres); |
if (isset($utilisateur) && !$this->etreNull($utilisateur)) { |
$utilisateur = $this->proteger($utilisateur); |
$sql = " AND identifiant = $utilisateur "; |
$sql = " AND courriel_utilisateur = $utilisateur "; |
} |
return $sql; |
} |
609,7 → 602,7 |
extract($this->parametres); |
if (isset($num_taxon) && !$this->etreNull($num_taxon)) { |
$num_taxon = $this->proteger($num_taxon); |
$sql = " AND num_taxon = $num_taxon "; |
$sql = " AND nt = $num_taxon "; |
} |
return $sql; |
} |
631,28 → 624,7 |
private function getSqlWhereProjet($projet) { |
$sql = null; |
if (isset($projet) && !$this->etreNull($projet)) { |
$mot_cle_encode = $this->bdd->quote($this->encoderMotCle($projet)); |
|
// Construction de la requête |
$requete = 'SELECT * '. |
'FROM cel_mots_cles_obs '. |
"WHERE cmc_id_mot_cle_general = $mot_cle_encode "; |
$elements_projet = $this->executerRequete($requete); |
|
$requete_projet = array(); |
if ($elements_projet != false && count($elements_projet) > 0) { |
// Pré-construction du where de la requête |
$tpl_where = '(mots_cles LIKE "%%%s%%" AND identifiant = %s )'; |
|
foreach ($elements_projet as $occurence) { |
$requete_projet[] = sprintf($tpl_where, $occurence['cmc_id_mot_cle_utilisateur'], $this->bdd->quote($occurence['cmc_id_proprietaire'])); |
} |
} else { |
$this->messages[] = "Aucune observation ne correspond à ce mot clé."; |
} |
if (count($requete_projet) > 0) { |
$sql = implode(" \nOR ", $requete_projet); |
} |
$sql = 'co.mots_cles_texte LIKE '.$this->proteger($projet); |
} |
return $sql; |
} |
659,7 → 631,6 |
|
private function construireWhereTag() { |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
$tag_sql = isset($tag) ? $this->getSqlWhereObsAvecImagesTaguees($tag) : null; |
if (!$this->etreNull($tag_sql)) { |
676,11 → 647,11 |
if (isset($tag) && !$this->etreNull($tag)) { |
$tag_sql = $this->getSqlWhereMotsCles($tag); |
// Construction de la requête |
$requete = 'SELECT DISTINCT coi_ce_observation AS ordre, coi_ce_utilisateur AS utilisateur '. |
$requete = 'SELECT DISTINCT coi.id_observation AS id_obs, coi.ce_utilisateur AS utilisateur '. |
'FROM cel_images '. |
' LEFT JOIN cel_obs_images '. |
' LEFT JOIN cel_obs_images coi'. |
' ON (ci_id_image = coi_ce_image) '. |
' LEFT JOIN cel_inventory AS i '. |
' LEFT JOIN cel_obs AS i '. |
' ON (coi_ce_utilisateur = i.identifiant AND coi_ce_observation = i.ordre) '. |
' LEFT JOIN locations AS l '. |
" ON (l.name = i.location AND l.code = i.id_location) ". |
702,19 → 673,19 |
$filtres = array(); |
foreach ($elements_tag as $occurence) { |
$utilisateur = $occurence['utilisateur']; |
$ordre = $occurence['ordre']; |
$id_obs = $occurence['id_obs']; |
if (!array_key_exists($utilisateur, $filtres)) { |
$filtres[$utilisateur] = array(); |
} |
if (!array_key_exists($ordre, $filtres[$utilisateur])) { |
$filtres[$utilisateur][$ordre] = $ordre; |
if (!array_key_exists($id_obs, $filtres[$utilisateur])) { |
$filtres[$utilisateur][$id_obs] = $id_obs; |
} |
} |
|
// Pré-construction du where de la requête |
$tpl_where = "(identifiant = '%s' AND ordre IN (%s))"; |
foreach ($filtres as $utilisateur => $ordres) { |
$requete_tag[] = sprintf($tpl_where, $utilisateur, implode(',', $ordres)); |
$tpl_where = "(id_observation IN (%s))"; |
foreach ($filtres as $utilisateur => $id_obs) { |
$requete_tag[] = sprintf($tpl_where, implode(',', $id_obs)); |
} |
|
} else { |
733,49 → 704,7 |
private function getSqlWhereMotsCles($tag) { |
$sql = null; |
$mots_cles = $this->decomposerParametreTag($tag); |
|
// Construction de la requête |
$requete = 'SELECT cmc_id_proprietaire AS utilisateur, cmc_id_mot_cle_general AS mot_cle_general, '. |
' cmc_id_mot_cle_utilisateur AS mot_cle_utilisateur '. |
'FROM cel_mots_cles_images '. |
'WHERE '.$this->getSqlWhereMotsClesImages($mots_cles['motsClesEncodesProteges']); |
$elements_projet = $this->executerRequete($requete); |
//$this->debug[] = $requete; |
|
$requete_projet = array(); |
if ($elements_projet != false && count($elements_projet) > 0) { |
// Pré-construction du where de la requête |
if ($mots_cles['type'] == 'OR') { |
$tpl_where = '(ci_meta_mots_cles LIKE "%%%s,%%" AND ci_ce_utilisateur = %s )'; |
foreach ($elements_projet as $occurence) { |
$requete_projet[] = sprintf($tpl_where, $occurence['mot_cle_utilisateur'], $this->bdd->quote($occurence['utilisateur'])); |
} |
} else { |
$tpl_where_mc = "ci_meta_mots_cles LIKE '%%%s,%%'"; |
$tpl_where = '((%s) AND ci_ce_utilisateur = %s)'; |
$utilisateur_mc = array(); |
foreach ($elements_projet as $occurence) { |
if (!isset($utilisateur_mc[$occurence['utilisateur']][$occurence['mot_cle_general']])) { |
$utilisateur_mc[$occurence['utilisateur']][$occurence['mot_cle_general']] = $occurence['mot_cle_utilisateur']; |
} |
} |
|
foreach ($utilisateur_mc as $utilisateur => $mots_cles_utilisateur) { |
if (count($mots_cles_utilisateur) == count($mots_cles['motsCles'])) { |
$where_mots_cles_utilisateur = array(); |
foreach ($mots_cles_utilisateur as $mot_cle) { |
$where_mots_cles_utilisateur[] = sprintf($tpl_where_mc, $mot_cle); |
} |
$where_mots_cles_utilisateur = implode(' AND ', $where_mots_cles_utilisateur); |
$utilisateur = $this->bdd->quote($utilisateur); |
$requete_projet[] = sprintf($tpl_where, $where_mots_cles_utilisateur, $utilisateur); |
} |
} |
} |
} else { |
$this->messages[] = "Aucune observation ne correspond à ce mot clé."; |
} |
|
$requete_projet = $this->getSqlWhereMotsClesImages($tag); |
$sql = implode(" \nOR ", $requete_projet); |
//$this->debug[] = $sql; |
return $sql; |
787,7 → 716,7 |
private function getSqlWhereMotsClesImages($mots_cles_encodes) { |
$where_mots_cles_images = array(); |
foreach ($mots_cles_encodes as $mot_cle_encode) { |
$where_mots_cles_images[] = "cmc_id_mot_cle_general = $mot_cle_encode"; |
$where_mots_cles_images[] = "ci.mots_cles_texte = $mot_cle_encode"; |
} |
$where_mots_cles_images = implode(' OR ', $where_mots_cles_images); |
return $where_mots_cles_images; |
806,7 → 735,7 |
} |
|
foreach ($mots_cles['motsCles'] as $mot) { |
$mots_cles['motsClesEncodesProteges'][] = $this->bdd->quote($this->encoderMotCle($mot)); |
$mots_cles['motsClesEncodesProteges'][] = $this->bdd->quote($mot); |
} |
$this->debug[] = $mots_cles; |
return $mots_cles; |
820,11 → 749,11 |
list($type, $coord) = explode(':', $station); |
|
if ($type == 'UTM') { |
list($x_utm, $y_utm, $secteur) = explode('-', $coord); |
$station_infos = array('x_utm' => $x_utm, 'y_utm' => $y_utm, 'secteur' => $secteur); |
list($utm_x, $utm_y, $secteur) = explode('-', $coord); |
$station_infos = array('utm_x' => $utm_x, 'utm_y' => $utm_y, 'secteur' => $secteur); |
} else if ($type == 'LngLat') { |
list($coord_y, $coord_x) = explode('-', $coord); |
$station_infos = array('coord_y' => $coord_y, 'coord_x' => $coord_x); |
list($longitude, $latitude) = explode('-', $coord); |
$station_infos = array('longitude' => $longitude, 'latitude' => $latitude); |
} |
$station_infos['type'] = $type; |
} |