| 63,6 → 63,7 |
|---|
| $json = null; |
| $parametres = $this->traiterParametres(array('utilisateur', 'projet', 'dept', 'num_taxon'), $params, false); |
| extract($parametres); |
| $dept = $this->traiterValeursMultiples($dept); |
| |
| $requete = 'SELECT sector, x_utm, y_utm '. |
| 'FROM cel_inventory AS i '. |
| 70,7 → 71,7 |
|---|
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |
| (isset($dept) ? " AND l.code IN ($dept) " : ''). |
| (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ). |
| (isset($projet) ? ' AND ('.$this->getSqlWhereProjet($projet).') ' : '' ); |
| $resultats = $this->executerRequete($requete); |
| 132,6 → 133,7 |
|---|
| $json = null; |
| $parametres = $this->traiterParametres(array('cle', 'utilisateur', 'projet', 'dept', 'num_taxon'), $params, false); |
| extract($parametres); |
| $dept = $this->traiterValeursMultiples($dept); |
| |
| // Vérification que la clé passée dans l'url est correspond à celle attendue |
| if ($cle == $this->config['jrest_admin']['cleCarto']) { |
| 141,7 → 143,7 |
|---|
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |
| (isset($dept) ? " AND l.code IN ($dept) " : ''). |
| (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ). |
| (isset($projet) ? ' AND ('.$this->getSqlWhereProjet($projet).') ' : '' ); |
| $resultats = $this->executerRequete($requete); |
| 198,6 → 200,7 |
|---|
| $json = null; |
| $parametres = $this->traiterParametres(array('station', 'utilisateur', 'projet', 'dept', 'num_taxon'), $params, false); |
| extract($parametres); |
| $dept = $this->traiterValeursMultiples($dept); |
| |
| // Récupération des coordonnées depuis l'id station |
| //$this->debug[] = $station; |
| 223,7 → 226,7 |
|---|
| (($type == 'UTM') ? " AND (sector = '$secteur' AND x_utm = '$x_utm' AND y_utm = '$y_utm' ) " : ''). |
| (($type == 'LngLat') ? " AND (coord_x = '$coord_x' AND coord_y = '$coord_y' ) " : ''). |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : ''). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |
| (isset($dept) ? " AND l.code IN ($dept) " : ''). |
| (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ). |
| ((isset($projet) && $projet_sql != '') ? " AND ($projet_sql) " : '' ). |
| 'ORDER BY nom_sel ASC '; |
| 247,7 → 250,7 |
|---|
| $json = null; |
| $parametres = $this->traiterParametres(array('utilisateur', 'projet', 'dept', 'num_taxon'), $params, false); |
| extract($parametres); |
| |
| $dept = $this->traiterValeursMultiples($dept); |
| // Récupération du filtre where pour les mots clés "projet" |
| if (isset($projet)) { |
| $projet_sql = $this->getSqlWhereProjet($projet); |
| 259,7 → 262,7 |
|---|
| " ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ". |
| "WHERE transmission = '1' ". |
| (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : ''). |
| (isset($dept) ? " AND l.insee_code LIKE '$dept%' " : ''). |
| (isset($dept) ? " AND l.code IN ($dept) " : ''). |
| (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ). |
| ((isset($projet) && $projet_sql != '') ? " AND ($projet_sql) " : '' ). |
| 'ORDER BY nom_ret ASC '; |
| 301,6 → 304,5 |
|---|
| |
| $sql = implode(" \nOR ", $requete_projet); |
| return $sql; |
| } |
| |
| } |
| } |