From 81beb5afb946d8c9ccfa2bbdfcfe884771a5bd3b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 2 May 2013 22:16:14 +1200
Subject: Fix extended info XML format

---
 src/org/traccar/protocol/CarscopProtocolDecoder.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/src/org/traccar/protocol/CarscopProtocolDecoder.java b/src/org/traccar/protocol/CarscopProtocolDecoder.java
index accc04ebd..93354498a 100644
--- a/src/org/traccar/protocol/CarscopProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarscopProtocolDecoder.java
@@ -24,6 +24,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.ServerManager;
 import org.traccar.helper.Log;
+import org.traccar.model.ExtendedInfoFormatter;
 import org.traccar.model.Position;
 
 public class CarscopProtocolDecoder extends BaseProtocolDecoder {
@@ -79,7 +80,7 @@ public class CarscopProtocolDecoder extends BaseProtocolDecoder {
         // Create new position
         Position position = new Position();
         position.setDeviceId(deviceId);
-        StringBuilder extendedInfo = new StringBuilder("<protocol>carscop</protocol>");
+        ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("carscop");
         index = 1;
 
         // Time
@@ -120,14 +121,10 @@ public class CarscopProtocolDecoder extends BaseProtocolDecoder {
         position.setCourse(Double.valueOf(parser.group(index++)));
         
         // State
-        extendedInfo.append("<state>");
-        extendedInfo.append(parser.group(index++));
-        extendedInfo.append("</state>");
+        extendedInfo.set("state", parser.group(index++));
 
         // Milage
-        extendedInfo.append("<milage>");
-        extendedInfo.append(Integer.valueOf(parser.group(index++)));
-        extendedInfo.append("</milage>");
+        extendedInfo.set("milage", Integer.valueOf(parser.group(index++)));
 
         position.setExtendedInfo(extendedInfo.toString());
         return position;
-- 
cgit v1.2.3