2 files changed, 49 insertions, 93 deletions

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;
     }