HostnameSortSwapWords: Make name order mangling configurable

We still default to having the mangling enabled.  Arguably this is
wrong I'm am minimising the number of things that will be wrong for
the existing Cambridge instance.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index 9fbadbdd2016ebcd712804f640f0d6cf97304b54..5854257e8f24c5b71188dfd46d4824d6d9c40105 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -73,6 +73,8 @@ our %c = qw(
     Baud  115200
 
     DebianNonfreeFirmware firmware-bnx2
+
+    HostnameSortSwapWords 1
 );
 
 $c{$_}='' foreach qw(

diff --git a/mg-hosts b/mg-hosts
index 497139a988a1d234f43ee9491c2e6342b6ba374a..a911099c0d7c3dec213c1479d3e3ed985c524009 100755 (executable)
--- a/mg-hosts
+++ b/mg-hosts
@@ -439,9 +439,10 @@ END
 
 sub cmd_showflags () {
     die if @ARGV;
+    my $sortkey = !$c{HostnameSortSwapWords} ? "hostname"
+       : "split_part(hostname, '-', 2), hostname";
     my $hostsq= $dbh_tests->prepare(<<END);
-        SELECT hostname FROM hostflags ORDER BY
-            split_part(hostname, '-', 2), hostname
+        SELECT hostname FROM hostflags ORDER BY $sortkey
 END
     my $findq= $dbh_tests->prepare(<<END);
         SELECT * FROM hostflags ORDER BY hostflag

diff --git a/ms-planner b/ms-planner
index f045bbf4ea27fa8e44bda1f10cbb9083827838e8..1dd01a95ba829a61f1e06759faf46f0054551698 100755 (executable)
--- a/ms-planner
+++ b/ms-planner
@@ -563,7 +563,9 @@ sub cmd_show_html () {
        } @{ $plan->{Events}{$reso} } ];
     }
 
-    my $colheadsortkey= sub { ($_[0] =~ m/-/ ? "$' $`" : "").$_[0]; };
+    my $colheadsortkey=
+       !$c{HostnameSortSwapWords} ? sub { $_[0]; }
+        : sub { ($_[0] =~ m/-/ ? "$' $`" : "").$_[0]; };
     my @colheads = sort {
         $colheadsortkey->($a) cmp $colheadsortkey->($b)
     } keys %{ $plan->{Events} };