Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 603 → Rev 604

/trunk/jrest/services/CelWidgetMap.php
68,7 → 68,7
$requete = 'SELECT sector, x_utm, y_utm '.
'FROM cel_inventory AS i '.
' LEFT JOIN locations AS l '.
" ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
" ON (l.name = i.location AND l.code = i.id_location) ".
"WHERE transmission = '1' ".
(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ).
(isset($dept) ? " AND l.code IN ($dept) " : '').
140,7 → 140,7
$requete = 'SELECT sector, x_utm, y_utm, coord_x, coord_y, ref_geo '.
'FROM cel_inventory AS i '.
' LEFT JOIN locations AS l '.
" ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
" ON (l.name = i.location AND l.code = i.id_location) ".
"WHERE transmission = '1' ".
(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '' ).
(isset($dept) ? " AND l.code IN ($dept) " : '').
221,7 → 221,7
' sector, x_utm, y_utm, insee_code '.
'FROM cel_inventory AS i '.
' LEFT JOIN locations AS l '.
" ON (l.name = i.location AND l.code = TRIM(LEADING '0' FROM i.id_location)) ".
" ON (l.name = i.location AND l.code = i.id_location) ".
"WHERE transmission = '1' ".
(($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' ) " : '').
259,7 → 259,7
$requete = 'SELECT DISTINCT nom_sel, num_nom_sel, 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 = TRIM(LEADING '0' FROM i.id_location)) ".
" ON (l.name = i.location AND l.code = i.id_location) ".
"WHERE transmission = '1' ".
(isset($utilisateur) ? " AND identifiant = '$utilisateur' " : '').
(isset($dept) ? " AND l.code IN ($dept) " : '').