ArchiveMediaSize and ArchiveChunkSize from _search_archive config

[BackupPC.git] / lib / BackupPC / Search.pm

diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index 43587dc..479b51d 100644 (file)
--- a/lib/BackupPC/Search.pm
+++ b/lib/BackupPC/Search.pm
@@ -15,13 +15,13 @@ use Data::Dump qw(dump);
 my $on_page = 100;
 my $pager_pages = 10;
 
-my $dsn = $Conf{SearchDSN};
-my $db_user = $Conf{SearchUser} || '';
+my $dbh;
 
-sub search_module {
+my $bpc = BackupPC::Lib->new || die;
+$bpc->ConfigRead('_search_archive');
+my %Conf = $bpc->Conf();
 
-       my $bpc = BackupPC::Lib->new || die;
-       my %Conf = $bpc->Conf();
+sub search_module {
 
        my $search_module = $Conf{SearchModule} || die "search is disabled";
        eval "use $search_module";
@@ -37,7 +37,7 @@ sub search_module {
 my $dbh;
 
 sub get_dbh {
-       $dbh ||= DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 1 } );
+       $dbh ||= DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 1 } );
        return $dbh;
 }
 
@@ -300,10 +300,9 @@ sub getGzipName($$$)
 sub get_tgz_size_by_name($) {
        my $name = shift;
 
-       my $tgz = $Conf{InstallDir}.'/'.$Conf{GzipTempDir}.'/'.$name;
+       my $tgz = $Conf{GzipTempDir}.'/'.$name;
        my $size = -1;
 
-       my $Dir = $Conf{InstallDir}."/data/log";
        $|=1;
        if (-f "${tgz}.tar.gz") {
                $size = (stat("${tgz}.tar.gz"))[7];
@@ -374,7 +373,7 @@ sub getGzipSize($$)
 sub getVolumes($) {
        my $id = shift;
 
-       my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+       my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
 
        my $sth = $dbh->prepare(qq{
                select
@@ -450,7 +449,7 @@ print STDERR "## sort=". ($param->{'sort'} || 'no sort param') . " burn sql orde
                $row->{'age'} = sprintf("%0.1f", ( $row->{'age'} / 86400 ) );
                #$row->{'age'} = sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) );
 
-               my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+               my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
                if ($row->{size} > $max_archive_size) {
                        ($row->{volumes}, $row->{inc_size_calc}) = getVolumes($row->{id});
                }
@@ -470,8 +469,8 @@ sub displayBackupsGrid($) {
 
        my $param = shift;
 
-       my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
-       my $max_archive_file_size = $Conf{MaxArchiveFileSize}  || die "no MaxFileInSize";
+       my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
+       my $max_archive_file_size = $Conf{ArchiveChunkSize}  || die "no MaxFileInSize";
 
        my $retHTML .= q{
                <form id="forma" method="POST" action="}.$MyURL.q{?action=burn">