scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utils: fixes some number parsing

Browse Source
This commit is contained in:
Jed Reynolds
2020-03-23 22:01:30 -07:00
parent 919830e876
commit d16c42603f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LANforge/Utils.pm
View File

@@ -1085,13 +1085,14 @@ sub expand_unit_str {
die("Utils::expand_unit_str expects string to parse") die("Utils::expand_unit_str expects string to parse")
if (!(defined $string) || ("" eq $string)); if (!(defined $string) || ("" eq $string));
return 0 if ($string =~ /^0+\s*\w+$/); return 0 if ($string =~ /^[0\.]+\s*\w+$/);
my ($num, $suf) = $string =~ /^(\d+)\s*(\w*)$/; my ($num, $suf) = $string =~ /^([\.0-9]+)\s*(\w*)$/;
if (!(defined $num) || ("" eq $num)) { if (!(defined $num) || ("" eq $num)) {
die("Utils::expand_unit_str exects something like 33Mbps or '33 Mbps', not $string"); die("Utils::expand_unit_str exects something like 33Mbps or '33 Mbps', not $string");
} }
my $multiplier = 1; my $multiplier = 1;
#print "String[$string] => $num Suffix $suf\n";
if (!(defined $suf) || ("" eq $suf)) { if (!(defined $suf) || ("" eq $suf)) {
$multiplier = 1; $multiplier = 1;
print STDERR "Utils::expand_unit_str saw no suffix in [$string]\n"; print STDERR "Utils::expand_unit_str saw no suffix in [$string]\n";