From 9b9774e150345bd762863b153f2a2bb02881b45a Mon Sep 17 00:00:00 2001
From: Daniel Collin <dcollin@users.noreply.github.com>
Date: Mon, 7 Dec 2015 16:47:48 +0100
Subject: [PATCH] bug fixes

Former-commit-id: 73a44e02291ae0e73acd589f5c82bd270357ac78
---
 build.xml                                             | 10 ++++++----
 src/se/koc/hal/PowerChallenge.java                    |  4 ++--
 src/se/koc/hal/deamon/DataSynchronizationDaemon.java  |  3 +--
 src/se/koc/hal/plugin/localsensor/ImpulseTracker.java |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index b70ce87f..1de26190 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
 	<!-- ________________________ PUBLIC TARGETS ________________________ -->
 	
 
-	<target name="run-local-sensor" depends="build">
+	<target name="run-local-sensor" depends="">
 		<java fork="true" failonerror="true" classname="se.koc.hal.plugin.localsensor.ImpulseTracker">
 			<classpath>
 				<pathelement path="${buildDir}/hal.jar"/>	<!--wildcard may not be platform independent, ok?-->
@@ -34,7 +34,7 @@
 		</java>
 	</target>
 	
-	<target name="run-remote-sensor" depends="build">
+	<target name="run-remote-sensor" depends="">
 		<java fork="true" failonerror="true" classname="se.koc.hal.plugin.tellstick.TelstickSerialCommTest">
 			<classpath>
 				<pathelement path="${buildDir}/hal.jar"/>	<!--wildcard may not be platform independent, ok?-->
@@ -43,7 +43,7 @@
 		</java>
 	</target>
 	
-	<target name="run-main-server" depends="build">
+	<target name="run-main-server" depends="">
 		<java fork="true" failonerror="true" classname="se.koc.hal.PowerChallenge">
 			<classpath>
 				<pathelement path="${buildDir}/hal.jar"/>	<!--wildcard may not be platform independent, ok?-->
@@ -64,10 +64,12 @@
 		<mkdir dir="${buildDir}" />
 		<javac srcdir="${srcDir}" destdir="${buildDir}" fork="yes">
 			<include name="**/*.java" />
+			<exclude name="se/koc/hal/tts/GoogleTTSClient.java" />
 			<classpath refid="classpath.build" />
 		</javac>
 		<javac srcdir="${testDir}" destdir="${buildDir}" fork="yes">
 			<include name="**/*.java" />
+			<exclude name="se/koc/hal/test/JarvisSyntersizerTest.java" />
 			<classpath refid="classpath.build" />
 		</javac>
 		<jar destfile="${buildDir}/hal.jar" basedir="${buildDir}" excludes="hal.jar" />
@@ -87,4 +89,4 @@
 	</target>
 	
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
index 4072cdf5..b394b395 100755
--- a/src/se/koc/hal/PowerChallenge.java
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -43,11 +43,11 @@ public class PowerChallenge {
             daemon.initiate(daemonTimer);
         }
         
-        /*HttpServer http = new HttpServer(80);
+        HttpServer http = new HttpServer(80);
         http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
         http.setPage("/", new PCOverviewHttpPage());
         http.setPage("/configure", new PCConfigureHttpPage());
         http.setPage("/heatmap", new PCHeatMapHttpPage());
-        http.start();*/
+        http.start();
     }
 }
diff --git a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
index f3bea97c..180c3625 100755
--- a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
+++ b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
@@ -21,8 +21,7 @@ import zutil.net.threaded.ThreadedTCPNetworkServerThread;
 
 public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implements HalDaemon{
 	private static final Logger logger = LogUtil.getLogger();
-	//public static final int SERVER_PORT = 6666;
-	public static final int SERVER_PORT = 80;
+	public static final int SERVER_PORT = 6666;
 
 
 	public DataSynchronizationDaemon() {
diff --git a/src/se/koc/hal/plugin/localsensor/ImpulseTracker.java b/src/se/koc/hal/plugin/localsensor/ImpulseTracker.java
index 722ad1ca..dad529ae 100644
--- a/src/se/koc/hal/plugin/localsensor/ImpulseTracker.java
+++ b/src/se/koc/hal/plugin/localsensor/ImpulseTracker.java
@@ -59,7 +59,7 @@ public class ImpulseTracker implements Runnable {
         
         //start a daemon thread to save the impulse count every minute 
         Thread thread = new Thread(this);
-        thread.setDaemon(true);
+        thread.setDaemon(false);
         thread.start();
         
     }
@@ -102,7 +102,7 @@ public class ImpulseTracker implements Runnable {
 			@Override
 			public void run() {
 				try {
-					db.exec("INSERT INTO sensor_data_raw (timestamp, sensor_id, data) VALUE("+timestamp_end+", "+2+", "+data+")");
+					db.exec("INSERT INTO sensor_data_raw(timestamp, sensor_id, data) VALUES("+timestamp_end+", "+2+", "+data+")");
 				} catch (SQLException e) {
 					e.printStackTrace();
 				}