8 files changed, 220 insertions, 110 deletions

diff --git a/src/Main.java b/src/Main.java
index 6c3eb0915..933259318 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,10 +1,10 @@
-import net.sourceforge.opentracking.Daemon;
+import net.sourceforge.opentracking.Server;
 
 public class Main {
 
     public static void main(String[] args) throws Exception {
 
-        Daemon service = new Daemon();
+        Server service = new Server();
         service.init(args);
         service.start();
     }
diff --git a/src/net/sourceforge/opentracking/DataManager.java b/src/net/sourceforge/opentracking/DataManager.java
index ed4523d9f..cd67c97da 100644
--- a/src/net/sourceforge/opentracking/DataManager.java
+++ b/src/net/sourceforge/opentracking/DataManager.java
@@ -16,7 +16,6 @@
 package net.sourceforge.opentracking;
 
 import java.util.List;
-import java.sql.SQLException;
 
 /**
  * Data manager
@@ -24,13 +23,18 @@ import java.sql.SQLException;
 public interface DataManager {
 
     /**
-     * Get device list
+     * Read device list
      */
-    public List readDevice() throws SQLException;
+    public List getDevices() throws Exception;
+
+    /**
+     * Get device by imei
+     */
+    public Device getDeviceByImei(String imei) throws Exception;
 
     /**
      * Write position
      */
-    public void writePosition(Position position) throws SQLException;
+    public void setPosition(Position position) throws Exception;
 
 }
diff --git a/src/net/sourceforge/opentracking/Daemon.java b/src/net/sourceforge/opentracking/Server.java
index 493d47191..0ed3de44e 100644
--- a/src/net/sourceforge/opentracking/Daemon.java
+++ b/src/net/sourceforge/opentracking/Server.java
@@ -15,6 +15,8 @@
  */
 package net.sourceforge.opentracking;
 
+import java.util.Map;
+import java.util.HashMap;
 import java.util.List;
 import java.util.LinkedList;
 import java.util.Properties;
@@ -30,16 +32,16 @@ import net.sourceforge.opentracking.protocol.xexun.XexunFrameDecoder;
 import net.sourceforge.opentracking.protocol.xexun.XexunProtocolDecoder;
 
 /**
- * Daemon
+ * Server
  */
-public class Daemon implements DataManager {
+public class Server implements DataManager {
 
     /**
      * Server list
      */
     private List serverList;
 
-    public Daemon() {
+    public Server() {
         serverList = new LinkedList();
     }
 
@@ -51,8 +53,13 @@ public class Daemon implements DataManager {
 
         // Load properties
         Properties properties = new Properties();
-        properties.loadFromXML(new FileInputStream(arguments[0]));
-        //properties.loadFromXML(Daemon.class.getResourceAsStream("/configuration.xml"));
+        if (arguments.length > 0) {
+            properties.loadFromXML(new FileInputStream(arguments[0]));
+        } else {
+            properties.loadFromXML(
+                    new FileInputStream("/home/user/NetBeansProjects/tracker-server/dev/configuration.xml"));
+        }
+        //properties.loadFromXML(Server.class.getResourceAsStream("/configuration.xml"));
 
         initDatabase(properties);
         initXexunServer(properties);
@@ -102,7 +109,12 @@ public class Daemon implements DataManager {
         }
     }
 
-    public synchronized List readDevice() throws SQLException {
+    /**
+     * Devices
+     */
+    private Map devices;
+
+    public synchronized List getDevices() throws SQLException {
 
         List deviceList = new LinkedList();
 
@@ -117,7 +129,23 @@ public class Daemon implements DataManager {
         return deviceList;
     }
 
-    public synchronized void writePosition(Position position) throws SQLException {
+    public Device getDeviceByImei(String imei) throws SQLException {
+
+        // Init device list
+        if (devices == null) {
+            devices = new HashMap();
+
+            List deviceList = getDevices();
+
+            for (Object device: deviceList) {
+                devices.put(((Device) device).getImei(), device);
+            }
+        }
+
+        return (Device) devices.get(imei);
+    }
+
+    public synchronized void setPosition(Position position) throws SQLException {
 
         insertPosition.setInt("device_id", position.getDeviceId().intValue());
         insertPosition.setTimestamp("time", position.getTime());
@@ -152,6 +180,13 @@ public class Daemon implements DataManager {
     }
 
     /**
+     * Init Gps103 server
+     */
+    public void initGps103Server(Properties properties) throws SQLException {
+
+    }
+
+    /**
      * Start
      */
     public void start() {
diff --git a/src/net/sourceforge/opentracking/TrackerEventHandler.java b/src/net/sourceforge/opentracking/TrackerEventHandler.java
index 218dd944b..b47f3be5a 100644
--- a/src/net/sourceforge/opentracking/TrackerEventHandler.java
+++ b/src/net/sourceforge/opentracking/TrackerEventHandler.java
@@ -20,7 +20,6 @@ import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.ChannelPipelineCoverage;
-import java.sql.SQLException;
 
 /**
  * Tracker message handler
@@ -47,9 +46,8 @@ public class TrackerEventHandler extends SimpleChannelHandler {
 
             // Write position to database
             try {
-                dataManager.writePosition((Position) e.getMessage());
+                dataManager.setPosition((Position) e.getMessage());
             } catch (Exception error) {
-                //System.out.println("write error");
             }
         }
     }
diff --git a/src/net/sourceforge/opentracking/TrackerServer.java b/src/net/sourceforge/opentracking/TrackerServer.java
index 0dc40e8b4..4b38920c7 100644
--- a/src/net/sourceforge/opentracking/TrackerServer.java
+++ b/src/net/sourceforge/opentracking/TrackerServer.java
@@ -47,7 +47,6 @@ public class TrackerServer extends ServerBootstrap {
 
         @Override
         public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) {
-            //System.out.println("connected: " + e.getChannel().getRemoteAddress());
             server.getChannelGroup().add(e.getChannel());
         }
     }
diff --git a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
new file mode 100644
index 000000000..63b1e0f13
--- /dev/null
+++ b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2010 Anton Tananaev (anton@tananaev.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sourceforge.opentracking.protocol.gps103;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import net.sourceforge.opentracking.Position;
+import net.sourceforge.opentracking.DataManager;
+
+/**
+ * Gps 103 tracker protocol decoder
+ */
+@ChannelPipelineCoverage("all")
+public class Gps103ProtocolDecoder extends OneToOneDecoder {
+
+    /**
+     * Data manager
+     */
+    private DataManager dataManager;
+
+    /**
+     * Init device table
+     */
+    public Gps103ProtocolDecoder(DataManager newDataManager) {
+        dataManager = newDataManager;
+    }
+
+    /**
+     * Regular expressions pattern
+     */
+    static private Pattern pattern = Pattern.compile(
+            "imei:" +
+            "([\\d]+)," +                       // IMEI
+            "[^,]+," +
+            "[\\d]+," +
+            ",[FL]," +                          // F - full / L - low
+            "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
+            "([AV])," +                         // Validity
+            "([\\d]{2})([\\d]{2}.[\\d]{4})," +  // Latitude (DDMM.MMMM)
+            "([NS])," +
+            "([\\d]{3})([\\d]{2}.[\\d]{4})," +  // Longitude (DDDMM.MMMM)
+            "([EW])," +
+            "([\\d]+.[\\d]{2}),");              // Speed
+
+    /**
+     * Decode message
+     */
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, Object msg)
+            throws Exception {
+
+        // Parse message
+        String sentence = (String) msg;
+        Matcher parser = pattern.matcher(sentence);
+        if (!parser.matches()) {
+            return null;
+        }
+
+        // Create new position
+        Position position = new Position();
+
+        Integer index = 1;
+
+        // Get device by IMEI
+        String imei = parser.group(index++);
+        position.setDeviceId(dataManager.getDeviceByImei(imei).getId());
+
+        // Time
+        Calendar time = new GregorianCalendar();
+        time.clear();
+        time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
+        time.set(Calendar.MILLISECOND, Integer.valueOf(parser.group(index++)));
+        position.setTime(time.getTime());
+
+        // Validity
+        position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
+
+        // Latitude
+        Double latitude = Double.valueOf(parser.group(index++));
+        latitude += Double.valueOf(parser.group(index++)) / 60;
+        if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
+        position.setLatitude(latitude);
+
+        // Longitude
+        Double lonlitude = Double.valueOf(parser.group(index++));
+        lonlitude += Double.valueOf(parser.group(index++)) / 60;
+        if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude;
+        position.setLongitude(lonlitude);
+
+        // Speed
+        position.setSpeed(Double.valueOf(parser.group(index++)));
+        position.setCourse(0.0);
+
+        return position;
+    }
+
+}
diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java b/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java
index be0a92dc6..d864b10ba 100644
--- a/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/xexun/XexunFrameDecoder.java
@@ -16,82 +16,66 @@ import org.jboss.netty.buffer.ChannelBuffer;
  */
 public class XexunFrameDecoder extends FrameDecoder {
 
-    protected Object decode(
-            ChannelHandlerContext ctx,
-            Channel channel,
-            ChannelBuffer buf) throws Exception {
-
-        //System.out.println("read: " + buf.readableBytes());
-
-        // Check minimum length
-        int length = buf.readableBytes();
-        if (length < 100) {
-            return null;
-        }
+    /**
+     * Find string in network buffer
+     */
+    private static Integer find(
+            ChannelBuffer buf,
+            Integer start,
+            Integer length,
+            String subString) {
+
+        int index = start;
+        boolean match;
 
-        // Find identifier
-        int index = 0;
-        int countDigit = 0;
         for (; index < length; index++) {
-
-            // Check byte
-            char c = (char) buf.getByte(index);
-            if (Character.isDigit(c)) {
-                countDigit++;
+            match = true;
+
+            for (int i = 0; i < subString.length(); i++) {
+                char c = (char) buf.getByte(index + i);
+                if (c != subString.charAt(i)) {
+                    match = false;
+                    break;
+                }
             }
 
-            // Check count
-            if (countDigit == 10) {
-                break;
+            if (match) {
+                return index;
             }
         }
 
-        if (countDigit < 10) {
-            return null;
-        }
+        return null;
+    }
 
-        // Find begin
-        int beginIndex = 0;
-        for (; index < length; index++) {
+    protected Object decode(
+            ChannelHandlerContext ctx,
+            Channel channel,
+            ChannelBuffer buf) throws Exception {
 
-            char c = (char) buf.getByte(index);
-            if (c == ',') {
-                beginIndex = index;
-                break;
-            }
-        }
+        System.out.println("read: " + buf.readableBytes());
+        System.out.println("buffer: " + buf.toString("UTF-8"));
 
-        if (beginIndex == 0) {
+        // Check minimum length
+        int length = buf.readableBytes();
+        if (length < 100) {
             return null;
         }
 
-        // Find imei
-        int imeiIndex = 0;
-        for (; index < length; index++) {
-
-            char c = (char) buf.getByte(index);
-            if (c == ':') {
-                imeiIndex = index;
-                break;
-            }
+        // Find start
+        Integer beginIndex = find(buf, 0, length, "GPRMC");
+        if (beginIndex == null) {
+            return null;
         }
 
-        if (imeiIndex == 0) {
+        // Find identifier
+        Integer idIndex = find(buf, beginIndex, length, "imei:");
+        if (idIndex == null) {
             return null;
         }
 
         // Find end
-        int endIndex = 0;
-        for (; index < length; index++) {
-
-            char c = (char) buf.getByte(index);
-            if (c == ',') {
-                endIndex = index;
-                break;
-            }
-        }
-
-        if (endIndex == 0) {
+        Integer endIndex = find(buf, idIndex, length, ",");
+        if (endIndex == null) {
             return null;
         }
 
diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
index 226c6ac0f..39161f45b 100644
--- a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
@@ -15,22 +15,16 @@
  */
 package net.sourceforge.opentracking.protocol.xexun;
 
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 import java.text.ParseException;
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
 import org.jboss.netty.channel.ChannelPipelineCoverage;
 import net.sourceforge.opentracking.Position;
-import net.sourceforge.opentracking.Device;
 import net.sourceforge.opentracking.DataManager;
 import java.sql.SQLException;
 
@@ -41,41 +35,21 @@ import java.sql.SQLException;
 public class XexunProtocolDecoder extends OneToOneDecoder {
 
     /**
-     * Init device table
+     * Data manager
      */
-    public XexunProtocolDecoder(DataManager dataManager) throws SQLException {
-
-        // Create map
-        setDevices(new HashMap());
-
-        if (dataManager != null) {
-            List deviceList = dataManager.readDevice();
-
-            for (Object device: deviceList) {
-                getDevices().put(((Device) device).getImei(), device);
-            }
-        }
-    }
+    private DataManager dataManager;
 
     /**
-     * Devices
+     * Init device table
      */
-    private Map devices;
-
-    public Map getDevices() {
-        return devices;
-    }
-
-    private void setDevices(Map newDevices) {
-        devices = newDevices;
+    public XexunProtocolDecoder(DataManager newDataManager) {
+        dataManager = newDataManager;
     }
 
     /**
      * Regular expressions pattern
      */
     static private Pattern pattern = Pattern.compile(
-            "," +                               // Old: [\\d]+,
-            "\\+?[\\d]+," +                     // Trusted phone number
             "GPRMC," +
             "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
             "([AV])," +                         // Validity
@@ -87,19 +61,17 @@ public class XexunProtocolDecoder extends OneToOneDecoder {
             "([\\d]+.[\\d]{2})," +              // Course
             "([\\d]{2})([\\d]{2})([\\d]{2})," + // Date (DDMMYY)
             ".*imei:" +
-            "([\\d]+)," +                       // IMEI
-            ".*");
+            "([\\d]+),");                       // IMEI
 
     /**
      * Decode message
      */
     protected Object decode(
             ChannelHandlerContext ctx, Channel channel, Object msg)
-            throws ParseException {
+            throws Exception {
 
         // Parse message
         String sentence = (String) msg;
-        //System.out.println("parse: " + sentence);
         Matcher parser = pattern.matcher(sentence);
         if (!parser.matches()) {
             throw new ParseException(null, 0);
@@ -145,7 +117,7 @@ public class XexunProtocolDecoder extends OneToOneDecoder {
 
         // Get device by IMEI
         String imei = parser.group(index++);
-        position.setDeviceId(((Device) getDevices().get(imei)).getId());
+        position.setDeviceId(dataManager.getDeviceByImei(imei).getId());
 
         return position;
     }