From be47cecf6bd95e85eb562fcc7a62a39be72c3d80 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 30 Oct 2015 10:50:57 +1300
Subject: Fix an issue in GoSafe decoder

---
 src/org/traccar/protocol/GoSafeProtocolDecoder.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/org/traccar/protocol/GoSafeProtocolDecoder.java')

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();
 
-- 
cgit v1.2.3