From bf8d549cf76f182ed021cc6ecc0aa75e9cf90b67 Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Mon, 15 Dec 2014 17:05:18 +0000
Subject: [PATCH] Add "advanced" options to XML parsing node

Allows setting of attrkey and charkey
Push to close #348
---
 nodes/core/parsers/70-XML.html | 32 +++++++++++++++++++++++++++++++-
 nodes/core/parsers/70-XML.js   |  4 +++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/nodes/core/parsers/70-XML.html b/nodes/core/parsers/70-XML.html
index 8b0a28438..dbb543872 100644
--- a/nodes/core/parsers/70-XML.html
+++ b/nodes/core/parsers/70-XML.html
@@ -17,8 +17,36 @@
 <script type="text/x-red" data-template-name="xml">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
+        <input type="text" id="node-input-name" placeholder="Name" style="width:280px !important">
     </div>
+    <div class="form-row" id="advanced">
+    </div>
+    <div id="advanced-options">
+        <div class="form-row">
+            <i class="fa fa-key"></i> Represent XML tag attributes as a property named <input type="text" id="node-input-attr" style="width:20px !important">
+        </div>
+        <div class="form-row">
+            <i class="fa fa-key"></i> Prefix to access character content <input type="text" id="node-input-chr" style="width:20px !important">
+        </div>
+        <div class="form-tips">There is no simple way to convert XML attributes to JSON
+        so the approach taken here is to add a property, named $ by default, to the JSON structure.</div>
+    </div>
+    <script> {
+        var showadvanced = showadvanced || true;
+        var showall = function() {
+            showadvanced = !showadvanced;
+            if (showadvanced) {
+                $("#advanced-options").show();
+                $("#advanced").html('<label for="node-advanced" style="width:200px !important"><i class="fa fa-minus-square"></i> Advanced options</label>');
+            }
+            else {
+                $("#advanced-options").hide();
+                $("#advanced").html('<label for="node-advanced" style="width:200px !important"><i class="fa fa-plus-square"></i> Advanced options ...</label>');
+            }
+        };
+        showall();
+        $("#advanced").click( function() { showall(); });
+    } </script>
 </script>
 
 <script type="text/x-red" data-help-name="xml">
@@ -33,6 +61,8 @@
         category: 'function',
         color:"#DEBD5C",
         defaults: {
+            attr: {value:'$',required:true},
+            chr: {value:'_',required:true},
             name: {value:""}
         },
         inputs:1,
diff --git a/nodes/core/parsers/70-XML.js b/nodes/core/parsers/70-XML.js
index 931de7f58..0ebb18bd5 100644
--- a/nodes/core/parsers/70-XML.js
+++ b/nodes/core/parsers/70-XML.js
@@ -22,6 +22,8 @@ module.exports = function(RED) {
 
     function XMLNode(n) {
         RED.nodes.createNode(this,n);
+        this.attrkey = n.attr || '$';
+        this.charkey = n.chr || '_';
         var node = this;
         this.on("input", function(msg) {
             if (msg.hasOwnProperty("payload")) {
@@ -30,7 +32,7 @@ module.exports = function(RED) {
                     node.send(msg);
                 }
                 else if (typeof msg.payload == "string") {
-                    parseString(msg.payload, {strict:true,async:true}, function (err, result) {
+                    parseString(msg.payload, {strict:true,async:true,attrkey:node.attrkey,charkey:node.charkey}, function (err, result) {
                         if (err) { node.error(err); }
                         else {
                             msg.payload = result;