Subversion Repositories eFlore/Applications.cel

Rev

Rev 600 | Rev 694 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 600 Rev 604
Line 66... Line 66...
66
		$dept = $this->traiterValeursMultiples($dept);
66
		$dept = $this->traiterValeursMultiples($dept);
Line 67... Line 67...
67
		
67
		
68
		$requete =  'SELECT sector, x_utm, y_utm '.
68
		$requete =  'SELECT sector, x_utm, y_utm '.
69
                    'FROM cel_inventory AS i '.
69
                    'FROM cel_inventory AS i '.
70
                    '   LEFT JOIN locations AS l '.
70
                    '   LEFT JOIN locations AS l '.
71
                    "       ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
71
                    "       ON (l.name = i.location AND l.code = i.id_location) ".
72
                    "WHERE transmission = '1' ".
72
                    "WHERE transmission = '1' ".
73
                    (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ).
73
                    (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ).
74
                    (isset($dept) ? " AND l.code IN ($dept) " : '').
74
                    (isset($dept) ? " AND l.code IN ($dept) " : '').
75
                    (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).
75
                    (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).
Line 138... Line 138...
138
		// Vérification que la clé passée dans l'url est correspond à celle attendue
138
		// Vérification que la clé passée dans l'url est correspond à celle attendue
139
		if ($cle == $this->config['jrest_admin']['cleCarto']) {
139
		if ($cle == $this->config['jrest_admin']['cleCarto']) {
140
			$requete =  'SELECT sector, x_utm, y_utm, coord_x, coord_y, ref_geo '.
140
			$requete =  'SELECT sector, x_utm, y_utm, coord_x, coord_y, ref_geo '.
141
	                    'FROM cel_inventory AS i '.
141
	                    'FROM cel_inventory AS i '.
142
	                    '   LEFT JOIN locations AS l '.
142
	                    '   LEFT JOIN locations AS l '.
143
	                    "       ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
143
	                    "       ON (l.name = i.location AND l.code = i.id_location) ".
144
	                    "WHERE transmission = '1' ".
144
	                    "WHERE transmission = '1' ".
145
	                    (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ).
145
	                    (isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ).
146
	                    (isset($dept) ? " AND l.code IN ($dept) " : '').
146
	                    (isset($dept) ? " AND l.code IN ($dept) " : '').
147
	                    (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).
147
	                    (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).
148
	                    (isset($projet) ? ' AND ('.$this->getSqlWhereProjet($projet).') ' : '' );
148
	                    (isset($projet) ? ' AND ('.$this->getSqlWhereProjet($projet).') ' : '' );
Line 219... Line 219...
219
		$requete = 	'SELECT id, identifiant, nom_sel, nom_ret, num_nom_sel, num_nom_ret, num_taxon, famille, '.
219
		$requete = 	'SELECT id, identifiant, nom_sel, nom_ret, num_nom_sel, num_nom_ret, num_taxon, famille, '.
220
					'	lieudit, location, date_observation, milieu, commentaire, '.
220
					'	lieudit, location, date_observation, milieu, commentaire, '.
221
					'	sector, x_utm, y_utm, insee_code '.
221
					'	sector, x_utm, y_utm, insee_code '.
222
					'FROM cel_inventory AS i '.
222
					'FROM cel_inventory AS i '.
223
					'	LEFT JOIN locations AS l '.
223
					'	LEFT JOIN locations AS l '.
224
					"		ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
224
					"		ON (l.name = i.location AND l.code = i.id_location) ".
225
					"WHERE transmission = '1' ".
225
					"WHERE transmission = '1' ".
226
					(($type == 'UTM') ? "	AND (sector = '$secteur' AND x_utm = '$x_utm' AND y_utm = '$y_utm' ) " : '').
226
					(($type == 'UTM') ? "	AND (sector = '$secteur' AND x_utm = '$x_utm' AND y_utm = '$y_utm' ) " : '').
227
					(($type == 'LngLat') ? "	AND (coord_x = '$coord_x' AND coord_y = '$coord_y' ) " : '').
227
					(($type == 'LngLat') ? "	AND (coord_x = '$coord_x' AND coord_y = '$coord_y' ) " : '').
228
					(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '').
228
					(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '').
229
					(isset($dept) ? " AND l.code IN ($dept) " : '').
229
					(isset($dept) ? " AND l.code IN ($dept) " : '').
Line 257... Line 257...
257
		}
257
		}
Line 258... Line 258...
258
 
258
 
259
		$requete = 	'SELECT DISTINCT nom_sel, num_nom_sel, nom_ret, num_nom_ret, num_taxon, famille '.
259
		$requete = 	'SELECT DISTINCT nom_sel, num_nom_sel, nom_ret, num_nom_ret, num_taxon, famille '.
260
					'FROM cel_inventory AS i '.
260
					'FROM cel_inventory AS i '.
261
					'	LEFT JOIN locations AS l '.
261
					'	LEFT JOIN locations AS l '.
262
					"		ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
262
					"		ON (l.name = i.location AND l.code = i.id_location) ".
263
					"WHERE transmission = '1' ".
263
					"WHERE transmission = '1' ".
264
					(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '').
264
					(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '').
265
					(isset($dept) ? " AND l.code IN ($dept) " : '').
265
					(isset($dept) ? " AND l.code IN ($dept) " : '').
266
                    (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).
266
                    (isset($num_taxon) ? " AND num_taxon = '$num_taxon' " : '' ).