aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-24 09:37:49 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-24 09:37:49 +1200
commit2aa78ad4d0a424b3d4479bc29ff195375bdc821a (patch)
tree4f2543fde66eb18ae61d89f2403fd5c9e254c292
parent9e6506f2df372c9f29d7166da1080ed17c41fcdc (diff)
downloadtraccar-server-2aa78ad4d0a424b3d4479bc29ff195375bdc821a.tar.gz
traccar-server-2aa78ad4d0a424b3d4479bc29ff195375bdc821a.tar.bz2
traccar-server-2aa78ad4d0a424b3d4479bc29ff195375bdc821a.zip
Ingore semi-colon for GPS103
-rw-r--r--src/org/traccar/model/Event.java1
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java10
2 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 1781bcee4..8f5678dff 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -75,6 +75,7 @@ public abstract class Event {
public static final String KEY_IGNITION = "ignition";
public static final String KEY_FLAGS = "flags";
public static final String KEY_CHARGE = "charge";
+ public static final String KEY_IP = "ip";
// Starts with 1 not 0
public static final String PREFIX_TEMP = "temp";
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 38e6ec834..60714fbcf 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -52,11 +52,11 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.?\\d*)?,?" + // Speed
"(\\d+\\.?\\d*)?,?" + // Course
"(\\d+\\.?\\d*)?,?" + // Altitude
- "([^,]+)?,?" +
- "([^,]+)?,?" +
- "([^,]+)?,?" +
- "([^,]+)?,?" +
- "([^,]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
+ "([^,;]+)?,?" +
".*");
@Override