X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FArchive.pm;h=18f7ba48abeec9a7b1e3857aa786feb98ff3f976;hp=8259fe26497c8fd669a4a4661a82396aaaeecfbd;hb=c615e1bfc6f2b0604a2658996f5dd6b6cfa9469c;hpb=7ea17fdc1fa132601268e2b4c0a2046af7eb9180
diff --git a/lib/BackupPC/CGI/Archive.pm b/lib/BackupPC/CGI/Archive.pm
index 8259fe2..18f7ba4 100644
--- a/lib/BackupPC/CGI/Archive.pm
+++ b/lib/BackupPC/CGI/Archive.pm
@@ -39,7 +39,7 @@ package BackupPC::CGI::Archive;
use strict;
use BackupPC::CGI::Lib qw(:all);
use Data::Dumper;
-use DBI;
+use BackupPC::Search;
sub action
{
@@ -61,7 +61,6 @@ 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" ) {
@@ -71,7 +70,6 @@ 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);
@@ -79,40 +77,8 @@ 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 $sth = $dbh->prepare(qq{
- select
- 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 = ?
- });
- $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 { $a <=> $b }
- grep { $all_backup_numbers->{$_} }
- keys %$all_backup_numbers;
-
my $checkboxes;
- foreach my $backupnumber ( @backup_nums ) {
+ foreach my $backupnumber ( BackupPC::Search::host_backup_nums($host) ) {
$checkboxes .= qq|
$backupnumber