keep ordered values, only resort on interval

[barcat.git] / barcat

diff --git a/barcat b/barcat
index 785df753eb73b8354f941ac6ae639afdeafa87de..1114656f74c0cab9a0a69eb91f3599ca78ffea26 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -72,12 +72,13 @@ if (defined $opt{interval}) {
 
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
 
-my (@lines, @values);
+my (@lines, @values, @order);
 my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
 while (readline) {
        s/\r?\n\z//;
        s/^\h*// unless $opt{unmodified};
        push @values, s/$valmatch/\n/ && $1;
+       push @order, $1 if length $1;
        if (defined $opt{trim}) {
                my $trimpos = abs $opt{trim};
                if ($trimpos <= 1) {
@@ -92,8 +93,6 @@ while (readline) {
 
 $SIG{INT} = 'DEFAULT';
 
-my @order;
-
 sub show_lines {
 
 state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
@@ -101,9 +100,9 @@ state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
 @lines or return;
 @lines > $nr or return unless $opt{hidemin};
 
-@order  = sort { $b <=> $a } grep { length } @values;
-my $maxval = $opt{hidemax} ? max @values[0 .. $opt{hidemax} - 1] : $order[0];
-my $minval = min $order[-1], 0;
+@order = sort { $b <=> $a } @order;
+my $maxval = ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0;
+my $minval = min $order[-1] // (), 0;
 my $lenval = $opt{'value-length'} // max map { length } @order;
 my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
        max map { length $values[$_] && length $lines[$_] }
@@ -171,6 +170,11 @@ while ($nr <= $#lines) {
 show_lines();
 
 if ($opt{stat}) {
+       if ($opt{hidemin} or $opt{hidemax}) {
+               $opt{hidemin} ||= 1;
+               $opt{hidemax} ||= @lines;
+               printf '%s of ', sum(@values[$opt{hidemin} - 1 .. $opt{hidemax} - 1]) // 0;
+       }
        my $total = sum @order;
        printf '%s total', $total;
        printf ' in %d values', scalar @values;