From 73f1943342354f5a3922561ca7ebefad239ce153 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 2 Nov 2012 18:44:36 +1300
Subject: Update config files (fix #74)

---
 setup/linux/linux.cfg     | 26 +++++++++++++++++++++++---
 setup/windows/windows.cfg | 31 ++++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 8 deletions(-)

(limited to 'setup')

diff --git a/setup/linux/linux.cfg b/setup/linux/linux.cfg
index b11fc209b..4c7ac58bb 100644
--- a/setup/linux/linux.cfg
+++ b/setup/linux/linux.cfg
@@ -51,8 +51,7 @@
     <-->
     <entry key="database.deleteDevice">
         DELETE FROM devices
-        WHERE id = :id
-        ORDER by time DESC;
+        WHERE id = :id;
     </entry>
 
     <!-->
@@ -61,7 +60,8 @@
     <entry key="database.selectPosition">
         SELECT *
         FROM positions
-        WHERE device_id = :device_id;
+        WHERE device_id = :device_id
+        ORDER by time DESC;
     </entry>
 
     <!-->
@@ -136,4 +136,24 @@
     <entry key="st210.enable">true</entry>
     <entry key="st210.port">5011</entry>
 
+    <!-- Progress server configuration -->
+    <entry key="progress.enable">true</entry>
+    <entry key="progress.port">5012</entry>
+
+    <!-- H02 server configuration -->
+    <entry key="h02.enable">true</entry>
+    <entry key="h02.port">5013</entry>
+
+    <!-- JT600 server configuration -->
+    <entry key="jt600.enable">true</entry>
+    <entry key="jt600.port">5014</entry>
+
+    <!-- EV603 server configuration -->
+    <entry key="ev603.enable">true</entry>
+    <entry key="ev603.port">5015</entry>
+
+    <!-- V680 server configuration -->
+    <entry key="v680.enable">true</entry>
+    <entry key="v680.port">5016</entry>
+    
 </properties>
diff --git a/setup/windows/windows.cfg b/setup/windows/windows.cfg
index f9ab829c8..fbe008aeb 100644
--- a/setup/windows/windows.cfg
+++ b/setup/windows/windows.cfg
@@ -25,7 +25,7 @@
     <-->
     <entry key="database.selectDevice">
         SELECT id, imei
-        FROM devices
+        FROM devices;
     </entry>
 
     <!-->
@@ -33,7 +33,7 @@
     <-->
     <entry key="database.insertDevice">
         INSERT INTO devices (imei)
-        VALUES (:imei)
+        VALUES (:imei);
     </entry>
 
     <!-->
@@ -43,7 +43,7 @@
     <entry key="database.updateDevice">
         UPDATE devices
         SET imei = :imei
-        WHERE id = :id
+        WHERE id = :id;
     </entry>
 
     <!-->
@@ -51,7 +51,7 @@
     <-->
     <entry key="database.deleteDevice">
         DELETE FROM devices
-        WHERE id = :id
+        WHERE id = :id;
     </entry>
 
     <!-->
@@ -61,6 +61,7 @@
         SELECT *
         FROM positions
         WHERE device_id = :device_id
+        ORDER by time DESC;
     </entry>
 
     <!-->
@@ -76,7 +77,7 @@
     <-->
     <entry key="database.insertPosition">
         INSERT INTO positions (device_id, time, valid, latitude, longitude, speed, course, power)
-	VALUES (:device_id, :time, :valid, :latitude, :longitude, :speed, :course, :power)
+	VALUES (:device_id, :time, :valid, :latitude, :longitude, :speed, :course, :power);
     </entry>
 
     <!-- Web interface port -->
@@ -135,4 +136,24 @@
     <entry key="st210.enable">true</entry>
     <entry key="st210.port">5011</entry>
 
+    <!-- Progress server configuration -->
+    <entry key="progress.enable">true</entry>
+    <entry key="progress.port">5012</entry>
+
+    <!-- H02 server configuration -->
+    <entry key="h02.enable">true</entry>
+    <entry key="h02.port">5013</entry>
+
+    <!-- JT600 server configuration -->
+    <entry key="jt600.enable">true</entry>
+    <entry key="jt600.port">5014</entry>
+
+    <!-- EV603 server configuration -->
+    <entry key="ev603.enable">true</entry>
+    <entry key="ev603.port">5015</entry>
+
+    <!-- V680 server configuration -->
+    <entry key="v680.enable">true</entry>
+    <entry key="v680.port">5016</entry>
+    
 </properties>
-- 
cgit v1.2.3