X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=perl%2FAmanda%2FReport%2Fxml.pm;h=6b5ea5038dca757379589ef6aa91cc1a82ce4a04;hb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;hp=1a78956686158d2b6dea650a6aea482a160e6de8;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda diff --git a/perl/Amanda/Report/xml.pm b/perl/Amanda/Report/xml.pm index 1a78956..6b5ea50 100644 --- a/perl/Amanda/Report/xml.pm +++ b/perl/Amanda/Report/xml.pm @@ -212,6 +212,20 @@ sub make_part_xml ); } +sub make_dump_xml +{ + my ($dle, $timestamp) = @_; + + return make_xml_elt( + "dump", + sub { + return join( xml_nl(), + make_xml_elt("date", $timestamp), + map { make_try_xml($_) } @{$dle->{'dumps'}->{$timestamp}}); + } + ); +} + sub make_dle_xml { my ( $hostname, $disk, $dle ) = @_; @@ -221,13 +235,16 @@ sub make_dle_xml return join( xml_nl(), make_xml_elt( "hostname", $hostname ), make_xml_elt( "disk", $disk ), - ( defined $dle->{estimate} && %{ $dle->{estimate} } > 0 ) - ? make_estimate_xml( $dle->{estimate} ) - : (), - exists $dle->{tries} ? map { make_try_xml($_) } - @{ $dle->{tries} } : (), - exists $dle->{parts} ? map { make_part_xml($_) } - @{ $dle->{parts} } : () ); + ( defined $dle->{estimate} && %{ $dle->{estimate} } > 0 )? + make_estimate_xml( $dle->{estimate} ) + : (), + ( keys %{$dle->{'dumps'}} > 0 ) ? + map { make_dump_xml($dle, $_) } keys %{$dle->{'dumps'}} + : (), + exists $dle->{parts} ? + map { make_part_xml($_) } @{ $dle->{parts} } + : () + ); } ); }