diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2012-11-02 18:44:36 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2012-11-02 18:44:36 +1300 |
| commit | 73f1943342354f5a3922561ca7ebefad239ce153 (patch) | |
| tree | 2f21f3fd1368af9b3b304a0afc9ee2d6cf917b18 | |
| parent | 276de889f5c6a144a8dc511041417fc77a09f9d6 (diff) | |
| download | trackermap-server-73f1943342354f5a3922561ca7ebefad239ce153.tar.gz trackermap-server-73f1943342354f5a3922561ca7ebefad239ce153.tar.bz2 trackermap-server-73f1943342354f5a3922561ca7ebefad239ce153.zip | |
Update config files (fix #74)
| -rw-r--r-- | default.cfg | 3 | ||||
| -rw-r--r-- | setup/linux/linux.cfg | 26 | ||||
| -rw-r--r-- | setup/windows/windows.cfg | 31 |
3 files changed, 51 insertions, 9 deletions
diff --git a/default.cfg b/default.cfg index a64759e21..de0301dae 100644 --- a/default.cfg +++ b/default.cfg @@ -60,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> <!--> 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>
|