Line 52... |
Line 52... |
52 |
* - la table contenant les donnees moissonees ne reprend pas tous les champs necessaires a l'exploitation par eflore (notamment pas de code localite, pas d'identifiant libre)
|
52 |
* - la table contenant les donnees moissonees ne reprend pas tous les champs necessaires a l'exploitation par eflore (notamment pas de code localite, pas d'identifiant libre)
|
53 |
*
|
53 |
*
|
54 |
* A terme, utilser vraiment le moissonage, y compris pour les donnees issues du CEL, en utilisant ABCD et en modifiant le programme d'harvesting.
|
54 |
* A terme, utilser vraiment le moissonage, y compris pour les donnees issues du CEL, en utilisant ABCD et en modifiant le programme d'harvesting.
|
55 |
*/
|
55 |
*/
|
56 |
$queryCel = "SELECT 'cel' as collection_code, zone_geo as location, REPLACE(ce_zone_geo,'INSEE-C:','') as id_location, date_observation, ".
|
56 |
$queryCel = "SELECT 'cel' as collection_code, zone_geo as location, REPLACE(ce_zone_geo,'INSEE-C:','') as id_location, date_observation, ".
|
57 |
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_cel.cel_obs ".
|
57 |
" longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_new_cel.cel_obs ".
|
58 |
"WHERE nt = '".$this->info['nt']."' ".
|
58 |
"WHERE nt = '".$this->info['nt']."' ".
|
59 |
" AND transmission = 1";
|
59 |
" AND transmission = 1";
|
60 |
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
|
60 |
$inventoriesCel = $this->getBdd()->recupererTous($queryCel);
|
61 |
return $inventoriesCel;
|
61 |
return $inventoriesCel;
|
62 |
}
|
62 |
}
|
Line 115... |
Line 115... |
115 |
$resultat = $this->getBdd()->recupererTous($requete);
|
115 |
$resultat = $this->getBdd()->recupererTous($requete);
|
116 |
$utm = $resultat;
|
116 |
$utm = $resultat;
|
117 |
}
|
117 |
}
|
118 |
} else {
|
118 |
} else {
|
119 |
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector".
|
119 |
$requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector".
|
120 |
" FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
|
120 |
" FROM tb_new_cel.cel_zones_geo WHERE nom LIKE $location_protege ";
|
121 |
$utm = $this->getBdd()->recupererTous($requete);
|
121 |
$utm = $this->getBdd()->recupererTous($requete);
|
122 |
}
|
122 |
}
|
123 |
return $utm;
|
123 |
return $utm;
|
124 |
}
|
124 |
}
|