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

---
 .../traccar/protocol/SkypatrolProtocolDecoder.java    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

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

diff --git a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java
index 11f9424aa..fedb411a6 100644
--- a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java
+++ b/src/org/traccar/protocol/SkypatrolProtocolDecoder.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;
 
 /**
@@ -84,13 +85,11 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
 
             // Create new position
             Position position = new Position();
-            StringBuilder extendedInfo = new StringBuilder("<protocol>skypatrol</protocol>");
+            ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("skypatrol");
 
             // Status code
             if (checkBit(mask, 1)) {
-                extendedInfo.append("<status>");
-                extendedInfo.append(buf.readUnsignedInt());
-                extendedInfo.append("</status>");
+                extendedInfo.set("status", buf.readUnsignedInt());
             }
 
             // Device id
@@ -183,9 +182,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
 
             // Satellites
             if (checkBit(mask, 16)) {
-                extendedInfo.append("<satellites>");
-                extendedInfo.append(buf.readUnsignedByte());
-                extendedInfo.append("</satellites>");
+                extendedInfo.set("satellites", buf.readUnsignedByte());
             }
 
             // Battery percentage
@@ -195,16 +192,12 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder {
 
             // Trip milage
             if (checkBit(mask, 20)) {
-                extendedInfo.append("<trip>");
-                extendedInfo.append(buf.readUnsignedInt());
-                extendedInfo.append("</trip>");
+                extendedInfo.set("trip", buf.readUnsignedInt());
             }
 
             // Milage
             if (checkBit(mask, 21)) {
-                extendedInfo.append("<milage>");
-                extendedInfo.append(buf.readUnsignedInt());
-                extendedInfo.append("</milage>");
+                extendedInfo.set("milage", buf.readUnsignedInt());
             }
 
             // Time of message generation
-- 
cgit v1.2.3