frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into tabs

Browse Source
This commit is contained in:
Nicholas O'Leary 2013-10-23 00:03:47 +01:00
commit ec09dc524a
3 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
nodes/analysis/73-parsexml.html
View File

@ -15,39 +15,39 @@
--> -->
<script type="text/x-red" data-template-name="xml2js"> <script type="text/x-red" data-template-name="xml2js">
<div class="form-row"> <div class="form-row">
<label>Use Console</label> <label>Use Console</label>
<input type="checkbox" id="node-input-useEyes" placeholder="Name" style="display: inline-block; width: auto; vertical-align: top;"> <input type="checkbox" id="node-input-useEyes" placeholder="Name" style="display: inline-block; width: auto; vertical-align: top;">
<label for="node-input-useEyes" style="width: 70%;">Debug output in console ?</label> <label for="node-input-useEyes" style="width: 70%;">Debug output in console ?</label>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="icon-tag"></i> Name</label> <label for="node-input-name"><i class="icon-tag"></i> Name</label>
<input type="text" id="node-input-name" placeholder="Name"> <input type="text" id="node-input-name" placeholder="Name">
</div> </div>
<div class="form-tips">Uses xml2js to process xml into javascript object.</div> <div class="form-tips">Uses xml2js to process xml into javascript object.</div>
</script> </script>
<script type="text/x-red" data-help-name="xml2js"> <script type="text/x-red" data-help-name="xml2js">
<p>A function that parses the <b>msg.payload</b> using the xml2js library. Places the result in the payload.</p> <p>A function that parses the <b>msg.payload</b> using the xml2js library. Places the result in the payload.</p>
<p>See <a href="https://github.com/Leonidas-from-XIV/node-xml2js/blob/master/README.md" target="_new">the xml2js docs <i>here</i></a> for more information.</p> <p>See <a href="https://github.com/Leonidas-from-XIV/node-xml2js/blob/master/README.md" target="_new">the xml2js docs <i>here</i></a> for more information.</p>
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
RED.nodes.registerType('xml2js',{ RED.nodes.registerType('xml2js',{
category: 'advanced-function', category: 'advanced-function',
color:"#E6E0F8", color:"#E6E0F8",
defaults: { defaults: {
useEyes: {value:false}, useEyes: {value:false},
name: {value:""}, name: {value:""},
}, },
inputs:1, inputs:1,
outputs:1, outputs:1,
icon: "arrow-in.png", icon: "arrow-in.png",
label: function() { label: function() {
return this.name||"xml2js"; return this.name||"xml2js";
}, },
labelStyle: function() { labelStyle: function() {
return this.name?"node_label_italic":""; return this.name?"node_label_italic":"";
} }
}); });
</script> </script>

37
nodes/analysis/73-parsexml.js
View File

@ -19,27 +19,28 @@ var util = require("util");
var parseString = require('xml2js').parseString; var parseString = require('xml2js').parseString;
var gotEyes = false; var gotEyes = false;
try { try {
var eyes = require("eyes"); var eyes = require("eyes");
gotEyes = true; gotEyes = true;
} catch(e) { } catch(e) {
util.log("[73-parsexml.js] Warning: Module 'eyes' not installed"); util.log("[73-parsexml.js] Note: Module 'eyes' not installed. (not needed, but useful)");
} }
function Xml2jsNode(n) { function Xml2jsNode(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
this.useEyes = n.useEyes; this.useEyes = n.useEyes;
var node = this; var node = this;
this.on("input", function(msg) {
this.on("input", function(msg) { parseString(msg.payload, function (err, result) {
parseString(msg.payload, function (err, result) { if (err) { node.error(err); }
msg.payload = result; else {
node.send(msg); msg.payload = result;
if (node.useEyes == true) { node.send(msg);
if (gotEyes == true) { eyes.inspect(msg); } if (node.useEyes == true) {
else { node.log(JSON.stringify(msg)); } if (gotEyes == true) { eyes.inspect(msg); }
} else { node.log(JSON.stringify(msg)); }
}); }
}); }
});
});
} }
RED.nodes.registerType("xml2js",Xml2jsNode); RED.nodes.registerType("xml2js",Xml2jsNode);

4
nodes/io/21-httpin.js
View File

@ -79,7 +79,9 @@ function HTTPRequest(n) {
var httplib = (/^https/.test(url))?https:http; var httplib = (/^https/.test(url))?https:http;
var node = this; var node = this;
this.on("input",function(msg) { this.on("input",function(msg) {
if (msg.url) {
httplib = (/^https/.test(msg.url))?https:http;
}
var opts = urllib.parse(msg.url||url); var opts = urllib.parse(msg.url||url);
opts.method = (msg.method||method).toUpperCase(); opts.method = (msg.method||method).toUpperCase();
if (msg.headers) { if (msg.headers) {