From 7896224929d8f2218e5171e8f0397961b7ec7089 Mon Sep 17 00:00:00 2001 From: Pierre Neyron <pierre.neyron@imag.fr> Date: Mon, 26 Sep 2022 11:16:37 +0200 Subject: [PATCH] [wiki:gen] Fix ugly error when rate is not set. --- lib/refrepo/gen/wiki/generators/hardware.rb | 2 +- lib/refrepo/gen/wiki/mw_utils.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb index 9695bb76100..ee268a9b7d0 100644 --- a/lib/refrepo/gen/wiki/generators/hardware.rb +++ b/lib/refrepo/gen/wiki/generators/hardware.rb @@ -86,7 +86,7 @@ class G5KHardwareGenerator < WikiGenerator [ { text: v['interface'] + ' ' + G5K.get_rate(v['rate']), - sort: v['interface'] + ' ' + ((v['rate'])/10**6).to_s.rjust(6, '0') + ' Gbps' + sort: v['interface'] + ' ' + G5K.get_rate(v['rate'], :sortable) } ] } diff --git a/lib/refrepo/gen/wiki/mw_utils.rb b/lib/refrepo/gen/wiki/mw_utils.rb index 690051cd944..6a9654753e4 100644 --- a/lib/refrepo/gen/wiki/mw_utils.rb +++ b/lib/refrepo/gen/wiki/mw_utils.rb @@ -102,7 +102,11 @@ module G5K end end - def self.get_rate(x) + def self.get_rate(x, unit=:auto) + if unit == :sortable + return '000000' if x.nil? + return (x.to_f / 10**6).floor.to_s.rjust(6, '0') + end return '' if (x == 0 || x.nil?) mbps = (x.to_f / 10**6).floor if mbps < 1000 -- GitLab