Now, we do not change the ordering by default.
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
# the last column will never be cutoff
# 'default' - optional default value for the column
# formatopts element order defines column order (left to right)
# the last column will never be cutoff
# 'default' - optional default value for the column
# formatopts element order defines column order (left to right)
-# sorts the output according to the leftmost column not containing any undef
+# $sort_key is either a column name, or integer 1 which simply
+# sorts the output according to the leftmost column not containing
+# any undef. if not specified, we do not change order.
- my ($formatopts, $data) = @_;
+ my ($formatopts, $data, $sort_key) = @_;
- my ($formatstring, @keys, @titles, %cutoffs, %defaults, $sort_key);
+ my ($formatstring, @keys, @titles, %cutoffs, %defaults);
my $last_col = $formatopts->[$#{$formatopts}];
my $last_col = $formatopts->[$#{$formatopts}];
+ my $autosort = 0;
+ if (defined($sort_key) && ($sort_key eq 1)) {
+ $autosort = 1;
+ $sort_key = undef;
+ }
+
foreach my $col ( @$formatopts ) {
my ($key, $title, $cutoff) = @$col{qw(key title cutoff)};
$title //= $key;
foreach my $col ( @$formatopts ) {
my ($key, $title, $cutoff) = @$col{qw(key title cutoff)};
$title //= $key;
my $titlelen = length($title);
my $longest = $titlelen;
my $titlelen = length($title);
my $longest = $titlelen;
+ my $sortable = $autosort;
foreach my $entry (@$data) {
my $len = length(data_to_text($entry->{$key})) // 0;
$longest = $len if $len > $longest;
foreach my $entry (@$data) {
my $len = length(data_to_text($entry->{$key})) // 0;
$longest = $len if $len > $longest;
# takes all fields of the results property, with a fallback
# to all fields occuring in items of $data.
sub print_api_list {
# takes all fields of the results property, with a fallback
# to all fields occuring in items of $data.
sub print_api_list {
- my ($data, $result_schema, $props_to_print) = @_;
+ my ($data, $result_schema, $props_to_print, $sort_key) = @_;
die "can only print object lists\n"
if !($result_schema->{type} eq 'array' && $result_schema->{items}->{type} eq 'object');
die "can only print object lists\n"
if !($result_schema->{type} eq 'array' && $result_schema->{items}->{type} eq 'object');
push @$formatopts, $colopts;
}
push @$formatopts, $colopts;
}
- print_text_table($formatopts, $data);
+ print_text_table($formatopts, $data, $sort_key);
- my ($format, $data, $result_schema, $props_to_print) = @_;
+ my ($format, $data, $result_schema, $props_to_print, $sort_key) = @_;
return if $result_schema->{type} eq 'null';
return if $result_schema->{type} eq 'null';
return if !scalar(@$data);
my $item_type = $result_schema->{items}->{type};
if ($item_type eq 'object') {
return if !scalar(@$data);
my $item_type = $result_schema->{items}->{type};
if ($item_type eq 'object') {
- print_api_list($data, $result_schema, $props_to_print);
+ print_api_list($data, $result_schema, $props_to_print, $sort_key);
} else {
foreach my $entry (@$data) {
print data_to_text($entry) . "\n";
} else {
foreach my $entry (@$data) {
print data_to_text($entry) . "\n";