From 4370557958e066943f9a953c7a3cc70574d411be Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Mon, 7 Dec 2015 21:49:00 +0100
Subject: [PATCH] SQL bug fix (Overview page still not working)

Former-commit-id: 497a8509c8d199e8d106f3baaa0de357caa922e7
---
 src/se/koc/hal/page/PCOverviewHttpPage.java | 64 ++++++++++-----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/se/koc/hal/page/PCOverviewHttpPage.java b/src/se/koc/hal/page/PCOverviewHttpPage.java
index aa49814a..8bbd8668 100755
--- a/src/se/koc/hal/page/PCOverviewHttpPage.java
+++ b/src/se/koc/hal/page/PCOverviewHttpPage.java
@@ -25,45 +25,45 @@ public class PCOverviewHttpPage implements HttpPage {
 		try {
 			DBConnection db = HalContext.getDB();
 			ArrayList<PowerData> minDataList = db.exec(
-					"SELECT user.username as username, "
-						+ "sensor_data_aggr.timestamp_start as timestamp_start, "
-						+ "sensor_data_aggr.timestamp_end as timestamp_end , "
-						+ "sensor_data_aggr.data as data, "
-						+ "sensor_data_aggr.confidence as confidence, "
+					"SELECT user.username as username,"
+						+ " sensor_data_aggr.timestamp_start as timestamp_start,"
+						+ " sensor_data_aggr.timestamp_end as timestamp_end,"
+						+ " sensor_data_aggr.data as data,"
+						+ " sensor_data_aggr.confidence as confidence,"
 						+ DataAggregatorDaemon.FIVE_MINUTES_IN_MS + " as period_length"
-					+ "FROM sensor_data_aggr, user, sensor "
-					+ "WHERE sensor.id = sensor_data_aggr.sensor_id "
-						+ "AND user.id = sensor.user_id "
-						+ "AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.FIVE_MINUTES_IN_MS-1)
-						+ "AND timestamp_start > " + (System.currentTimeMillis() - DataAggregatorDaemon.DAY_IN_MS)
-					+ "ORDER BY timestamp_start ASC",
+					+ " FROM sensor_data_aggr, user, sensor"
+					+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+						+ " AND user.id = sensor.user_id"
+						+ " AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.FIVE_MINUTES_IN_MS-1)
+						+ " AND timestamp_start > " + (System.currentTimeMillis() - DataAggregatorDaemon.DAY_IN_MS)
+					+ " ORDER BY timestamp_start ASC",
 					new SQLPowerDataBuilder());
 			ArrayList<PowerData> hourDataList = db.exec(
-					"SELECT user.username as username, "
-						+ "sensor_data_aggr.timestamp_start as timestamp_start, "
-						+ "sensor_data_aggr.timestamp_end as timestamp_end , "
-						+ "sensor_data_aggr.data as data, "
-						+ "sensor_data_aggr.confidence as confidence, "
+					"SELECT user.username as username,"
+						+ " sensor_data_aggr.timestamp_start as timestamp_start,"
+						+ " sensor_data_aggr.timestamp_end as timestamp_end,"
+						+ " sensor_data_aggr.data as data,"
+						+ " sensor_data_aggr.confidence as confidence,"
 						+ DataAggregatorDaemon.HOUR_IN_MS + " as period_length"
-					+ "FROM sensor_data_aggr, user, sensor "
-					+ "WHERE sensor.id = sensor_data_aggr.sensor_id "
-						+ "AND user.id = sensor.user_id "
-						+ "AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.HOUR_IN_MS-1)
-						+ "AND timestamp_start > " + (System.currentTimeMillis() - 3*DataAggregatorDaemon.DAY_IN_MS)
-					+ "ORDER BY timestamp_start ASC",
+					+ " FROM sensor_data_aggr, user, sensor"
+					+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+						+ " AND user.id = sensor.user_id"
+						+ " AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.HOUR_IN_MS-1)
+						+ " AND timestamp_start > " + (System.currentTimeMillis() - 3*DataAggregatorDaemon.DAY_IN_MS)
+					+ " ORDER BY timestamp_start ASC",
 					new SQLPowerDataBuilder());
 			ArrayList<PowerData> dayDataList = db.exec(
-					"SELECT user.username as username, "
-						+ "sensor_data_aggr.timestamp_start as timestamp_start, "
-						+ "sensor_data_aggr.timestamp_end as timestamp_end , "
-						+ "sensor_data_aggr.data as data, "
-						+ "sensor_data_aggr.confidence as confidence, "
+					"SELECT user.username as username,"
+						+ " sensor_data_aggr.timestamp_start as timestamp_start,"
+						+ " sensor_data_aggr.timestamp_end as timestamp_end,"
+						+ " sensor_data_aggr.data as data,"
+						+ " sensor_data_aggr.confidence as confidence,"
 						+ DataAggregatorDaemon.DAY_IN_MS + " as period_length"
-					+ "FROM sensor_data_aggr, user, sensor "
-					+ "WHERE sensor.id = sensor_data_aggr.sensor_id "
-						+ "AND user.id = sensor.user_id "
-						+ "AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.DAY_IN_MS-1)
-					+ "ORDER BY timestamp_start ASC",
+					+ " FROM sensor_data_aggr, user, sensor"
+					+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+						+ " AND user.id = sensor.user_id"
+						+ " AND timestamp_end-timestamp_start == " + (DataAggregatorDaemon.DAY_IN_MS-1)
+					+ " ORDER BY timestamp_start ASC",
 					new SQLPowerDataBuilder());