Skip to content

Commit bd4f83b

Browse files
committed
fix on data types
1 parent 18b6da7 commit bd4f83b

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

lib/commonBindings.js

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,13 @@ function parseMessage(message) {
5757
parsedMessage = message.toString(16);
5858
}
5959
config.getLogger().debug(context, 'stringMessage: [%s] parsedMessage: [%s]', stringMessage, parsedMessage);
60-
messageArray = [];
61-
if (Array.isArray(parsedMessage)) {
62-
messageArray = parsedMessage;
63-
} else {
64-
messageArray.push(parsedMessage);
65-
}
6660

6761
/* istanbul ignore if */
6862
if (parsedMessageError) {
6963
config.getLogger().error(context, 'MEASURES-003: Impossible to handle malformed message: %s', message);
7064
}
7165
config.getLogger().debug(context, 'parserMessage array: %s', messageArray);
72-
return messageArray;
66+
return parsedMessage;
7367
}
7468

7569
/**
@@ -95,20 +89,6 @@ function guessType(attribute, device) {
9589
return constants.DEFAULT_ATTRIBUTE_TYPE;
9690
}
9791

98-
function extractAttributes(device, current) {
99-
const values = [];
100-
for (const k in current) {
101-
if (current.hasOwnProperty(k)) {
102-
values.push({
103-
name: k,
104-
type: guessType(k, device),
105-
value: current[k]
106-
});
107-
}
108-
}
109-
return values;
110-
}
111-
11292
/* istanbul ignore next */
11393
function sendConfigurationToDevice(device, apiKey, deviceId, results, callback) {
11494
transportSelector.applyFunctionFromBinding([apiKey, deviceId, results], 'sendConfigurationToDevice', device.transport || config.getConfig().defaultTransport, callback);
@@ -158,7 +138,7 @@ function singleMeasure(apiKey, deviceId, attribute, device, parsedMessage) {
158138
{
159139
name: attribute,
160140
type: messageType,
161-
value: messageType === constants.OPCUA_NGSI_BINDING_STRING ? JSON.stringify(parsedMessage) : parsedMessage[0]
141+
value: parsedMessage
162142
}
163143
];
164144
config.getLogger().debug(context, 'values updates [%s]', JSON.stringify(values));
@@ -302,5 +282,4 @@ function opcuaMessageHandler(deviceId, mapping, variableValue, timestamp) {
302282

303283
exports.opcuaMessageHandler = opcuaMessageHandler;
304284
exports.messageHandler = messageHandler;
305-
exports.extractAttributes = extractAttributes;
306285
exports.guessType = guessType;

0 commit comments

Comments
 (0)