From 6e6cae04275835ab92c06c79fbe441b4faa1251e Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 15 Jan 2016 13:43:30 +0100
Subject: [PATCH] sync bug fix

Former-commit-id: 119b858e73eafa2be8c0dcde46b1ac24feae5e5b
---
 .../deamon/PCDataSynchronizationDaemon.java   |  2 +-
 src/se/hal/struct/AbstractDevice.java         | 21 +++++++------------
 src/se/hal/struct/Sensor.java                 |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/se/hal/deamon/PCDataSynchronizationDaemon.java b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
index fc4771c2..9c6e16bb 100755
--- a/src/se/hal/deamon/PCDataSynchronizationDaemon.java
+++ b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
@@ -105,7 +105,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
                                     SensorDataListDTO list = new SensorDataListDTO();
                                     while (result.next()) {
                                         SensorDataDTO data = new SensorDataDTO();
-                                        data.sequenceId = result.getLong("sensor_id");
+                                        data.sequenceId = result.getLong("sequence_id");
                                         data.timestampStart = result.getLong("timestamp_start");
                                         data.timestampEnd = result.getLong("timestamp_end");
                                         data.data = result.getInt("data");
diff --git a/src/se/hal/struct/AbstractDevice.java b/src/se/hal/struct/AbstractDevice.java
index 8732afab..7da94cc8 100755
--- a/src/se/hal/struct/AbstractDevice.java
+++ b/src/se/hal/struct/AbstractDevice.java
@@ -46,30 +46,20 @@ public abstract class AbstractDevice<T> extends DBBean {
         }
         return deviceData;
     }
-
     public void setDeviceData(T data) {
         this.deviceData = data;
         updateConfig();
     }
 
-
+    public String getConfig() {
+        return config;
+    }
     public void setConfig(String config) {
         if (this.config == null || !this.config.equals(config)) {
             this.config = config;
             this.deviceData = null; // invalidate current sensor data object
         }
     }
-
-    protected void updateConfig() {
-        Configurator<T> configurator = new Configurator<>(deviceData);
-        this.config = JSONWriter.toString(configurator.getValuesAsNode());
-    }
-
-    public String getConfig() {
-        return config;
-    }
-
-
     public void save(DBConnection db) throws SQLException {
         if (deviceData != null)
             updateConfig();
@@ -77,6 +67,11 @@ public abstract class AbstractDevice<T> extends DBBean {
             this.config = null;
         super.save(db);
     }
+    protected void updateConfig() {
+        Configurator<T> configurator = new Configurator<>(deviceData);
+        this.config = JSONWriter.toString(configurator.getValuesAsNode());
+    }
+
 
 
     public String getName() {
diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java
index 766a51ef..a95cb4b9 100755
--- a/src/se/hal/struct/Sensor.java
+++ b/src/se/hal/struct/Sensor.java
@@ -60,7 +60,7 @@ public class Sensor extends AbstractDevice<HalSensorData>{
     	PreparedStatement stmt = HalContext.getDB().getPreparedStatement("SELECT MAX(sequence_id) FROM sensor_data_aggr WHERE sensor_id == ?");
     	stmt.setLong(1, sensorId);
     	Integer id = DBConnection.exec(stmt, new SimpleSQLResult<Integer>());
-    	return (id != null ? id+1 : 1);
+    	return (id != null ? id : 0);
    }