xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

natural_sort_cmp: recursion to iterative implementation (#4314)

Browse Source 
* natural_sort_cmp: recursion to iterative implementation

* natural_sort_cmp: correct prototype with parameters, as per `man perlfunc`
This commit is contained in:
Samveen
2017-11-17 12:52:24 +07:00
committed by Bin Xu
parent a57d399e75
commit b314b1eb3b
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
perl-xCAT/xCAT/Utils.pm
View File

@ -4921,30 +4921,31 @@ sub acquire_lock_imageop {
#--------------------------------------------------------------------------------
=head3 natural_sort_cmp
compare $left and $right by natrual.
compare $left and $right by natural ordering.
=cut
#--------------------------------------------------------------------------------
sub natural_sort_cmp {
sub natural_sort_cmp($$) {
my $left = shift;
my $right = shift;
if( !($left =~ /\d+(\.\d+)?/) ) {
return $left cmp $right;
}
my $before = $`;
my $match = $&;
my $after = $';
if( !($right =~ /\d+(\.\d+)?/) ) {
return $left cmp $right;
}
if( $before eq $` ) {
if( $match == $& ) {
return natural_sort_cmp( $after, $' );
} else {
return $match <=> $&;
while() {
if( !($left =~ /\d+(\.\d+)?/) ) {
return $left cmp $right;
}
my $before = $`;
my $match = $&;
my $after = $';
if( !($right =~ /\d+(\.\d+)?/) ) {
return $left cmp $right;
}
if( $before ne $` ) {
return $left cmp $right;
} elsif( $match != $& ) {
return $match <=> $&;
} else {
$left = $after;
$right = $';
}
} else {
return $left cmp $right;
}
}

8
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@ -72,10 +72,6 @@ sub unsupported {
}
}
sub natural_sorter {
natural_sort_cmp( $a, $b );
}
#-------------------------------------------------------
=head3 handled_commands
@ -1895,7 +1891,7 @@ sub rinv_response {
# If sorted array has any contents, sort it naturally and print it
if (scalar @sorted_output > 0) {
# sort alpha, then numeric
foreach (sort natural_sorter @sorted_output) {
foreach (sort natural_sort_cmp @sorted_output) {
#
# The firmware output requires the ID to be part of the string to sort correctly.
# Remove this ID from the output to the user
@ -2394,7 +2390,7 @@ sub rvitals_response {
# If sorted array has any contents, sort it and print it
if (scalar @sorted_output > 0) {
# Sort the output, alpha, then numeric
xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (sort natural_sorter @sorted_output);
xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (sort natural_sort_cmp @sorted_output);
} else {
xCAT::SvrUtils::sendmsg("$::NO_ATTRIBUTES_RETURNED", $callback, $node);
}