added common BackupPC::Search::host_backup_nums

[BackupPC.git] / bin / BackupPC_ASA_ArchiveStart

diff --git a/bin/BackupPC_ASA_ArchiveStart b/bin/BackupPC_ASA_ArchiveStart
index da3ef77..e8341f5 100755 (executable)
--- a/bin/BackupPC_ASA_ArchiveStart
+++ b/bin/BackupPC_ASA_ArchiveStart
@@ -47,8 +47,8 @@ no  utf8;
 use lib "/usr/local/BackupPC/lib";
 use Getopt::Std;
 use BackupPC::Lib;
 use lib "/usr/local/BackupPC/lib";
 use Getopt::Std;
 use BackupPC::Lib;

+use BackupPC::Search;

 
 

-use DBI;

 use Data::Dump qw(dump);
 
 my $debug = $ENV{DEBUG} || 0;
 use Data::Dump qw(dump);
 
 my $debug = $ENV{DEBUG} || 0;


@@ -67,7 +67,7 @@ EOF
 
 my %Conf = $bpc->Conf();
 
 
 my %Conf = $bpc->Conf();
 

-my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 });
+my $dbh = BackupPC::Search::get_dbh;

 
 my $sth = $dbh->prepare(qq{
        select
 
 my $sth = $dbh->prepare(qq{
        select


@@ -106,28 +106,7 @@ foreach my $host ( keys %$Hosts ) {
                warn "$0: host $host doesn't have any backups... skipping\n";
                next;
        }
                warn "$0: host $host doesn't have any backups... skipping\n";
                next;
        }

-
-       my $all_backup_numbers;
-       $all_backup_numbers->{ $_->{num} }++ foreach @backups;
-
-       $sth->execute( $host );
-       while ( my $row = $sth->fetchrow_hashref ) {
-               warn "# row ",dump($row) if $debug;
-               $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 all_backup_numbers = ",dump($all_backup_numbers),"\n";
-
-       $host_nums->{$host} = [
-               sort
-               grep { $all_backup_numbers->{$_} }
-               keys %$all_backup_numbers
-       ];
+       $host_nums->{$host} = [ BackupPC::Search::host_backup_nums( $host ) ];

 }
 
 foreach ( @HostFilter ) {
 }
 
 foreach ( @HostFilter ) {