aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-07 11:40:12 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-07 11:40:12 +1200
commit74f54436bc43b9d2ed9d3d06760c7aaae9464b4b (patch)
tree2c3f0f6083e40be4a1eaefc86b7648495cc9122c /src/org/traccar/protocol
parent9a40169b25e52fe15008eca61867dd1f81a31fba (diff)
downloadtrackermap-server-74f54436bc43b9d2ed9d3d06760c7aaae9464b4b.tar.gz
trackermap-server-74f54436bc43b9d2ed9d3d06760c7aaae9464b4b.tar.bz2
trackermap-server-74f54436bc43b9d2ed9d3d06760c7aaae9464b4b.zip
Fix Totem regex parser
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/TotemProtocolDecoder.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java
index ef4c6e5eb..a22bbf71e 100644
--- a/src/org/traccar/protocol/TotemProtocolDecoder.java
+++ b/src/org/traccar/protocol/TotemProtocolDecoder.java
@@ -64,8 +64,9 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
"(\\d+.\\d+)\\|" + // Odometer
"\\d+\\|" + // Serial Number
".*\\|?" +
- "\\p{XDigit}{4}"); // Checksum
-
+ "\\p{XDigit}{4}" + // Checksum
+ "\r?\n?");
+
private static final Pattern patternSecond = Pattern.compile(
"\\$\\$" + // Header
"\\p{XDigit}{2}" + // Length
@@ -90,7 +91,8 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
"(\\d+)\\|" + // Temperature
"(\\d+.\\d+)\\|" + // Odometer
"\\d+\\|" + // Serial Number
- "\\p{XDigit}{4}"); // Checksum
+ "\\p{XDigit}{4}" + // Checksum
+ "\r?\n?");
private static final Pattern patternThird = Pattern.compile(
"\\$\\$" + // Header
@@ -119,7 +121,8 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder {
"(\\d{3})(\\d{2}\\.\\d{4})" + // Longitude (DDDMM.MMMM)
"([EW])" +
"\\d{4}" + // Serial Number
- "\\p{XDigit}{4}"); // Checksum
+ "\\p{XDigit}{4}" + // Checksum
+ "\r?\n?");
private enum MessageFormat {
first,