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

fix split to pass tests...

Browse Source
This commit is contained in:
Dave Conway-Jones 2017-06-16 09:21:53 +01:00
parent 55110dfbac
commit e70766a535
No known key found for this signature in database
GPG Key ID: 81B04231572A9A2D
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nodes/core/logic/17-split.js
View File

@ -78,7 +78,7 @@ module.exports = function(RED) {
msg.parts.count = count; msg.parts.count = count;
var pos = 0; var pos = 0;
var data = msg.payload; var data = msg.payload;
for (var i=0;i<count;i++) { for (var i=0; i<count; i++) {
msg.payload = data.substring(pos,pos+node.splt); msg.payload = data.substring(pos,pos+node.splt);
msg.parts.index = i; msg.parts.index = i;
pos += node.splt; pos += node.splt;
@ -110,7 +110,7 @@ module.exports = function(RED) {
var pos = 0; var pos = 0;
var data = msg.payload; var data = msg.payload;
msg.parts.len = node.arraySplt; msg.parts.len = node.arraySplt;
for (var i=0;i<count;i++) { for (var i=0; i<count; i++) {
msg.payload = data.slice(pos,pos+node.arraySplt); msg.payload = data.slice(pos,pos+node.arraySplt);
if (node.arraySplt === 1) { if (node.arraySplt === 1) {
msg.payload = msg.payload[0]; msg.payload = msg.payload[0];
@ -147,7 +147,7 @@ module.exports = function(RED) {
var pos = 0; var pos = 0;
var data = msg.payload; var data = msg.payload;
msg.parts.len = node.splt; msg.parts.len = node.splt;
for (var i=0;i<count;i++) { for (var i=0; i<count; i++) {
msg.payload = data.slice(pos,pos+node.splt); msg.payload = data.slice(pos,pos+node.splt);
msg.parts.index = i; msg.parts.index = i;
pos += node.splt; pos += node.splt;
@ -162,7 +162,7 @@ module.exports = function(RED) {
} }
var pos = msg.payload.indexOf(node.splt); var pos = msg.payload.indexOf(node.splt);
var end; var end;
while(pos > -1) { while (pos > -1) {
count++; count++;
end = pos+node.splt.length; end = pos+node.splt.length;
pos = msg.payload.indexOf(node.splt,end); pos = msg.payload.indexOf(node.splt,end);
@ -175,7 +175,7 @@ module.exports = function(RED) {
var i = 0, p = 0; var i = 0, p = 0;
var data = msg.payload; var data = msg.payload;
pos = data.indexOf(node.splt); pos = data.indexOf(node.splt);
while(pos > -1) { while (pos > -1) {
msg.payload = data.slice(p,pos); msg.payload = data.slice(p,pos);
msg.parts.index = i; msg.parts.index = i;
node.send(RED.util.cloneMessage(msg)); node.send(RED.util.cloneMessage(msg));
@ -252,7 +252,7 @@ module.exports = function(RED) {
var bufferLen = 0; var bufferLen = 0;
if (group.joinChar !== undefined) { if (group.joinChar !== undefined) {
var joinBuffer = Buffer.from(group.joinChar); var joinBuffer = Buffer.from(group.joinChar);
for (var i=0;i<group.payload.length;i++) { for (var i=0; i<group.payload.length; i++) {
if (i > 0) { if (i > 0) {
buffers.push(joinBuffer); buffers.push(joinBuffer);
bufferLen += joinBuffer.length; bufferLen += joinBuffer.length;
@ -416,7 +416,9 @@ module.exports = function(RED) {
} }
// TODO: currently reuse the last received - add option to pick first received // TODO: currently reuse the last received - add option to pick first received
group.msg = msg; group.msg = msg;
if (group.currentCount >= (group.targetCount || msg.parts.count) || msg.hasOwnProperty('complete')) { var tcnt = group.targetCount;
if (msg.hasOwnProperty("parts")) { tcnt = group.targetCount || msg.parts.count; }
if (group.currentCount >= tcnt || msg.hasOwnProperty('complete')) {
completeSend(partId); completeSend(partId);
} }
} catch(err) { } catch(err) {