From 9888addc8c8da134692077c918940b83535e405a Mon Sep 17 00:00:00 2001 From: Anthony Garcia Date: Mon, 18 Nov 2013 12:15:15 +0100 Subject: [PATCH] improve normalize function --- plugins/senslabmap/static/js/map.js | 33 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/plugins/senslabmap/static/js/map.js b/plugins/senslabmap/static/js/map.js index d2ae3f6d..e80ee9e1 100644 --- a/plugins/senslabmap/static/js/map.js +++ b/plugins/senslabmap/static/js/map.js @@ -1,15 +1,24 @@ var Senslab = { normalize: function(node) { - if (node.component_name) { //"wsn430-11.devlille.iot-lab.info", - var s = node.component_name.split('.'); - if (s[2] == 'iot-lab' && s[3] == 'info') { - node.arch = s[0].split('-')[0]; - node.id = s[0].split('-')[1]; - node.site = s[1]; - return true; - } + var info; + + if (node.component_name) { // wsn430-11.devlille.iot-lab.info + info = node.component_name.split("."); + } else if (node.hrn) { // iotlab.a8-11\.devgrenoble\.iot-lab\.info + var info = node.hrn.split("\\."); + info[0] = info[0].split(".")[1]; + } + + if (info && info[2] == "iot-lab" && info[3] == "info") { + node.arch = info[0].split("-")[0]; + node.id = info[0].split("-")[1]; + node.site = info[1]; + return true; + } else { + console.warn("could not normalize node :"); + console.warn(node); + return false; } - return false; } }; @@ -22,9 +31,9 @@ Senslab.Map = function() { }; var archs = [ - "wsn430", - "m3", - "a8" + "wsn430", + "m3", + "a8" ]; function Map($container) { -- 2.43.0