tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed sql error (oracle) in gis view. Ticket#2873

This commit is contained in:
Arturo Gonzalez Diaz 2015-10-23 13:31:46 +02:00
parent ba492135ca
commit 7a4110ebee
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_console/operation/agentes/gis_view.php
View File

@ -112,13 +112,31 @@ $countData = db_get_value_sql($sqlCount);
/* Get the elements to present in this page */ /* Get the elements to present in this page */
$sql = sprintf (" switch ($config["dbtype"]) {
SELECT longitude, latitude, altitude, start_timestamp, case "mysql":
end_timestamp, description, number_of_packages, manual_placement $sql = sprintf ("
FROM tgis_data_history SELECT longitude, latitude, altitude, start_timestamp,
WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d) end_timestamp, description, number_of_packages, manual_placement
ORDER BY end_timestamp DESC FROM tgis_data_history
LIMIT %d OFFSET %d", $agentId, get_system_time () - $period, $config['block_size'], (int)get_parameter ('offset')); WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d)
ORDER BY end_timestamp DESC
LIMIT %d OFFSET %d", $agentId, get_system_time () - $period, $config['block_size'], (int)get_parameter ('offset'));
break;
case "postgresql":
case "oracle":
$set = array ();
$set['limit'] = $config['block_size'];
$set['offset'] = (int)get_parameter ('offset');
$sql = sprintf ("
SELECT longitude, latitude, altitude, start_timestamp,
end_timestamp, description, number_of_packages, manual_placement
FROM tgis_data_history
WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d)
ORDER BY end_timestamp DESC", $agentId, get_system_time () - $period);
$sql = oracle_recode_query ($sql, $set);
break;
}
$result = db_get_all_rows_sql ($sql, true); $result = db_get_all_rows_sql ($sql, true);