From fa719a8b18d2f8bd3fb5fbeaf0b4abd30b35e96d Mon Sep 17 00:00:00 2001
From: Daniel Collin <dcollin@users.noreply.github.com>
Date: Mon, 18 Jan 2016 15:06:24 +0100
Subject: [PATCH] Resolved bug where external sensors data were deleted

Former-commit-id: 64ef329e3f1924629fe760cc3df8f324f67c04a9
---
 .classpath                                     | 2 +-
 src/se/hal/deamon/SensorDataCleanupDaemon.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index fcd2d4db..d06589af 100644
--- a/.classpath
+++ b/.classpath
@@ -16,7 +16,6 @@
 	<classpathentry kind="lib" path="external/marytts-5.1.2/lib/voice-cmu-slt-hsmm-5.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/Ab.jar"/>
 	<classpathentry kind="lib" path="lib/commons-math3-3.5.jar"/>
-	<classpathentry kind="lib" path="lib/jSerialComm-1.3.4.jar"/>
 	<classpathentry kind="lib" path="lib/marytts-client-5.1.2-jar-with-dependencies.jar"/>
 	<classpathentry kind="lib" path="lib/marytts-runtime-5.1.2-jar-with-dependencies.jar"/>
 	<classpathentry kind="lib" path="lib/pi4j-core-1.0.jar"/>
@@ -24,6 +23,7 @@
 	<classpathentry kind="lib" path="lib/java-speech-api-master.jar"/>
 	<classpathentry kind="lib" path="lib/sphinx4-core.jar"/>
 	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.11.2_HACKED_FOR_RPI.jar"/>
+	<classpathentry kind="lib" path="lib/jSerialComm-1.3.10.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/zutil-java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
diff --git a/src/se/hal/deamon/SensorDataCleanupDaemon.java b/src/se/hal/deamon/SensorDataCleanupDaemon.java
index 100b7007..c68af297 100755
--- a/src/se/hal/deamon/SensorDataCleanupDaemon.java
+++ b/src/se/hal/deamon/SensorDataCleanupDaemon.java
@@ -45,7 +45,7 @@ public class SensorDataCleanupDaemon implements HalDaemon {
     		//logger.fine("The sensor is of type: " + sensor.getDeviceData().getClass().getName()); // this will instantiate the external sensor data
     		if(sensor.getUser().isExternal()){
     			cleanupExternalSensorData(sensor.getId(), TimeUtility.FIVE_MINUTES_IN_MS, TimeUtility.DAY_IN_MS);
-        		cleanupExternalSensorData(sensor.getId(), TimeUtility.DAY_IN_MS, TimeUtility.WEEK_IN_MS);
+        		cleanupExternalSensorData(sensor.getId(), TimeUtility.HOUR_IN_MS, TimeUtility.WEEK_IN_MS);
     		}else{
 	    		cleanupInternalSensorData(sensor.getId(), TimeUtility.HOUR_IN_MS, TimeUtility.FIVE_MINUTES_IN_MS, TimeUtility.DAY_IN_MS);
 	    		cleanupInternalSensorData(sensor.getId(), TimeUtility.DAY_IN_MS, TimeUtility.HOUR_IN_MS, TimeUtility.WEEK_IN_MS);