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 cbf5f63..24ebaac 100644 (file)
--- a/lib/BackupPC/CGI/Archive.pm
+++ b/lib/BackupPC/CGI/Archive.pm
@@ -61,6 +61,8 @@ sub action
             my($fullDur, $incrCnt, $fullSize, $fullRate);
             my @Backups = $bpc->BackupInfoRead($host);
             my $fullCnt = $incrCnt = 0;
+            my $all_backup_numbers;
+
             for ( my $i = 0 ; $i < @Backups ; $i++ ) {
                 if ( $Backups[$i]{type} eq "full" ) {
                     $fullSize = $Backups[$i]{size} / (1024 * 1024);
@@ -69,6 +71,7 @@ sub action
                     $incrSizeTot = $Backups[$i]{size} / (1024 * 1024);
                 }
                 $backupnumber = $Backups[$i]{num};
+               $all_backup_numbers->{$backupnumber}++;
             }
             $fullSizeTot += $fullSize + $incrSizeTot;
             $fullSize = sprintf("%.2f", ($fullSize + $incrSizeTot) / 1000);
@@ -76,17 +79,40 @@ sub action
                $bpc->ConfigRead($archHost);
                %Conf = $bpc->Conf();
 
+use Data::Dump qw(dump);
+
                my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 });
-               my $backup_nums = $dbh->selectcol_arrayref(qq{
+               my $sth = $dbh->prepare(qq{
                        select
-                               backups.num as num
+                               hosts.name as host, -- FIXME for debug
+                               backups.num as num,
+                               inc_size,
+                               size,
+                               inc_deleted
                        from backups
                        join hosts on hosts.id = hostid
-                       where hosts.name = ? and inc_size < 0 and size > 0 and not inc_deleted
-               }, {}, $host);
+                       where hosts.name = ?
+               });
+               $sth->execute($host);
+               # and inc_size < 0 and size > 0 and not inc_deleted
+               while( my $row = $sth->fetchrow_hashref ) {
+warn "# row ",dump $row;
+                       $all_backup_numbers->{ $row->{num} } =
+                       $row->{inc_deleted}  ? 0 :
+                       $row->{size}    == 0 ? 0 :
+                       $row->{inc_size} > 0 ? 0 :
+                       $row->{size}     > 0 ? 1 :
+                       0;
+               }
+
+warn "# host $host all_backup_numbers = ",dump($all_backup_numbers);
+               my @backup_nums = 
+                       sort
+                       grep { $all_backup_numbers->{$_} }
+                       keys %$all_backup_numbers;
 
                my $checkboxes;
-               foreach my $backupnumber ( sort @$backup_nums ) {
+               foreach my $backupnumber ( @backup_nums ) {
                        $checkboxes .= qq|
 <input type="hidden" name="fcb$checkBoxCnt" value="$host">
 <input type="checkbox" name="backup$checkBoxCnt" value="$backupnumber">$backupnumber
@@ -162,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;
@@ -240,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},