fix backup selection

[BackupPC.git] / lib / BackupPC / CGI / Archive.pm

diff --git a/lib/BackupPC/CGI/Archive.pm b/lib/BackupPC/CGI/Archive.pm
index 6be934c..24ebaac 100644 (file)
--- a/lib/BackupPC/CGI/Archive.pm
+++ b/lib/BackupPC/CGI/Archive.pm
@@ -84,6 +84,7 @@ use Data::Dump qw(dump);
                my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 });
                my $sth = $dbh->prepare(qq{
                        select
+                               hosts.name as host, -- FIXME for debug
                                backups.num as num,
                                inc_size,
                                size,
@@ -99,12 +100,12 @@ warn "# row ",dump $row;
                        $all_backup_numbers->{ $row->{num} } =
                        $row->{inc_deleted}  ? 0 :
                        $row->{size}    == 0 ? 0 :
-                       $row->{inc_size} < 0 ? 1 :
+                       $row->{inc_size} > 0 ? 0 :
                        $row->{size}     > 0 ? 1 :
                        0;
                }
 
-warn dump($all_backup_numbers);
+warn "# host $host all_backup_numbers = ",dump($all_backup_numbers);
                my @backup_nums = 
                        sort
                        grep { $all_backup_numbers->{$_} }
@@ -187,6 +188,7 @@ EOF
             next if ( !defined($In{"fcb$i"}) );
             my $name = $In{"fcb$i"};
             my $backupno = $In{"backup$i"};
+            next unless defined $backupno; # ASA - skip hosts without backups checked
             push(@HostList, $name);
             push(@BackupList, $backupno);
             $hiddenStr .= <<EOF;
@@ -265,7 +267,7 @@ EOF
                 $compname = $Conf{CatPath};
                 $compext = '.raw';
             }
-            my $fullsplitsize = $In{splitsize} . '000000';
+            my $fullsplitsize = $In{splitsize} . '000000'; # mb -> bytes
             my %ArchiveReq = (
                 # parameters for the archive
                 archiveloc  => $In{archive_device},