aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-30 10:50:57 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-30 10:50:57 +1300
commitbe47cecf6bd95e85eb562fcc7a62a39be72c3d80 (patch)
treea587e2cbbae6dd972e9fe50eb2295a704183de5a /src/org/traccar
parent32e6b60fa4bfc8d4628457b4a6a83ef5afa0dcc9 (diff)
downloadtrackermap-server-be47cecf6bd95e85eb562fcc7a62a39be72c3d80.tar.gz
trackermap-server-be47cecf6bd95e85eb562fcc7a62a39be72c3d80.tar.bz2
trackermap-server-be47cecf6bd95e85eb562fcc7a62a39be72c3d80.zip
Fix an issue in GoSafe decoder
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/GoSafeProtocolDecoder.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java
index 7ec395672..38901cf88 100644
--- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java
+++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java
@@ -61,8 +61,8 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder {
.expression(",?")
.groupEnd()
.groupBegin()
- .text("GSM:").expression("[^,],?")
- .groupEnd("?")
+ .text("GSM:").expression("[^,]*,?")
+ .groupEnd()
.groupBegin()
.text("COT:")
.number("(d+)") // odometer
@@ -83,17 +83,17 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder {
.number("x+,?") // event status
.groupEnd("?")
.groupBegin()
- .text("ETD:").expression("[^,],?")
+ .text("ETD:").expression("[^,]*,?")
.groupEnd("?")
.groupBegin()
.text("OBD:")
.number("(x+),?")
.groupEnd("?")
.groupBegin()
- .text("FUL:").expression("[^,],?")
+ .text("FUL:").expression("[^,]*,?")
.groupEnd("?")
.groupBegin()
- .text("TRU:").expression("[^,],?")
+ .text("TRU:").expression("[^,]*,?")
.groupEnd("?")
.compile();