Merge tag 'upstream/3.3.3'

[debian/amanda] / perl / Amanda / Report.pm

diff --git a/perl/Amanda/Report.pm b/perl/Amanda/Report.pm
index 78a3c303425ca1508ab546aea68897eb9bebd44c..8490c94e1730363e8159a2d8b67de01833bc04e9 100644 (file)
--- a/perl/Amanda/Report.pm
+++ b/perl/Amanda/Report.pm
@@ -1,8 +1,9 @@
-# Copyright (c) 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2010-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -510,10 +511,22 @@ sub read_line
 
     if ( $type == $L_CONT ) {
        ${$self->{nbline_ref}}++;
-       push @{$self->{contline}}, $str if ${$self->{nbline_ref}} <= 100;
+       if ($str =~ /^\|/) {
+           $self->{nb_strange}++;
+           push @{$self->{contline}}, $str if $self->{nb_strange} + $self->{nb_error} <= 100;
+       } elsif ($str =~ /^\?/) {
+           $self->{nb_error}++;
+           push @{$self->{contline}}, $str if $self->{nb_error} <= 100;
+       } else {
+           $self->{nb_normal}++;
+           push @{$self->{contline}}, $str if ${$self->{nbline_ref}} <= 100;
+       }
        return;
     }
     $self->{contline} = undef;
+    $self->{nb_normal} = 0;
+    $self->{nb_strange} = 0;
+    $self->{nb_error} = 0;
 
     if ( $prog == $P_PLANNER ) {
         return $self->_handle_planner_line( $type, $str );
@@ -806,6 +819,9 @@ sub _handle_dumper_line
        $self->{contline} = $dumper->{stranges} ||= [];
        $dumper->{nb_stranges} = 0;
        $self->{nbline_ref} = \$dumper->{nb_stranges};
+       $self->{nb_normal} = 0;
+       $self->{nb_strange} = 0;
+       $self->{nb_error} = 0;
 
         return $self->{flags}{exit_status} |= STATUS_STRANGE
 
@@ -1153,6 +1169,9 @@ sub _handle_fail_line
         $self->{contline} = $program_d->{errors} ||= [];
        $program_d->{nb_errors} = 0;
        $self->{nbline_ref} = \$program_d->{nb_errors};
+       $self->{nb_normal} = 0;
+       $self->{nb_strange} = 0;
+       $self->{nb_error} = 0;
     }
 }