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/GalileoProtocolDecoder.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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

diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/org/traccar/protocol/GalileoProtocolDecoder.java
index 62669eb1c..d56bc0f6d 100644
--- a/src/org/traccar/protocol/GalileoProtocolDecoder.java
+++ b/src/org/traccar/protocol/GalileoProtocolDecoder.java
@@ -29,6 +29,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 GalileoProtocolDecoder extends BaseProtocolDecoder {
@@ -98,7 +99,7 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder {
         
         // Create new position
         Position position = new Position();
-        StringBuilder extendedInfo = new StringBuilder("<protocol>galileo</protocol>");
+        ExtendedInfoFormatter extendedInfo = new ExtendedInfoFormatter("galileo");
         
         while (buf.readerIndex() < length) {
             int tag = buf.readUnsignedByte();
@@ -134,9 +135,7 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder {
                     break;
                     
                 case TAG_STATUS:
-                    extendedInfo.append("<status>");
-                    extendedInfo.append(buf.readUnsignedShort());
-                    extendedInfo.append("</status>");
+                    extendedInfo.set("status", buf.readUnsignedShort());
                     break;
                     
                 case TAG_POWER:
@@ -144,15 +143,11 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder {
                     break;
                     
                 case TAG_BATTERY:
-                    extendedInfo.append("<battery>");
-                    extendedInfo.append(buf.readUnsignedShort());
-                    extendedInfo.append("</battery>");
+                    extendedInfo.set("battery", buf.readUnsignedShort());
                     break;
                     
                 case TAG_MILAGE:
-                    extendedInfo.append("<milage>");
-                    extendedInfo.append(buf.readUnsignedInt());
-                    extendedInfo.append("</milage>");
+                    extendedInfo.set("milage", buf.readUnsignedInt());
                     break;
                     
                 default:
-- 
cgit v1.2.3