135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#152] HP devices with port names "D##" not sorted by portsort.js

Browse Source 
In naturalsort there is handling for Float, Decimal and Scientific notation.
This looks for numbers like:
'10.04f','10.039F','10.038d','1.528535047e5'

It was breaking port sorting for ports named like "D1", "D10" etc.

Have removed support for sorting these numbers as it's unlikely we need that
in Netdisco, for now.
This commit is contained in:
Oliver Gorwits
2014-10-09 16:57:56 +01:00
parent 6564d9ca29
commit ae5ca802f4
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,3 +1,9 @@
2.029012 - 2014-10-09
[BUG FIXES]
* [#152] HP devices with port names "D##" not sorted by portsort.js
2.029011 - 2014-10-07 2.029011 - 2014-10-07
[BUG FIXES] [BUG FIXES]

6
Netdisco/share/public/javascripts/portsort.js
View File

@@ -24,7 +24,7 @@
* See: http://js-naturalsort.googlecode.com/svn/trunk/naturalSort.js * See: http://js-naturalsort.googlecode.com/svn/trunk/naturalSort.js
*/ */
function portSort (a, b) { function portSort (a, b) {
var re = /(^(-?\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi, var re = /(^0x[0-9a-f]+$|[0-9]+)/gi,
// string regex // string regex
sre = /(^[ ]*|[ ]*$)/g, sre = /(^[ ]*|[ ]*$)/g,
// octal regex // octal regex
@@ -56,8 +56,8 @@ function portSort (a, b) {
oFyNcL += ''; oFyNcL += '';
} }
if (oFxNcL < oFyNcL) return -1; if (oFxNcL < oFyNcL) { return -1; }
if (oFxNcL > oFyNcL) return 1; if (oFxNcL > oFyNcL) { return 1; }
} }
return 0; return 0;

1
Netdisco/t/10-sort_port.t
View File

@@ -13,5 +13,6 @@ BEGIN {
is(sort_port(1,1), 0, 'number - same values'); is(sort_port(1,1), 0, 'number - same values');
is(sort_port('1:2','1:10'), -1, 'colon number (Extreme) - first lesser'); is(sort_port('1:2','1:10'), -1, 'colon number (Extreme) - first lesser');
is(sort_port('D1','D10'), -1, 'HP - simple letter and number [#152]');
done_testing; done_testing;

12
Netdisco/t/html/portsort.html
View File

@@ -146,6 +146,18 @@
],[ ],[
'1:1','1:2','1:10','1:11' '1:1','1:2','1:10','1:11'
],'Extreme'); ],'Extreme');
wrapTest(
[
'D10','D11','D2','D1', 'A30', 'A3'
],[
'A3', 'A30', 'D1','D2','D10','D11'
],'HP A & D');
wrapTest(
[
'B10','B11','B2','B1', 'A30', 'A3'
],[
'A3', 'A30', 'B1','B2','B10','B11'
],'HP A & B');
wrapTest( wrapTest(
[ [
'10GigabitEthernet1/1/12', '10GigabitEthernet1/1/12',