ArchiveMediaSize and ArchiveChunkSize from _search_archive config

diff --git a/conf/config.pl b/conf/config.pl
index d852607..e0b682e 100644 (file)
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -2314,13 +2314,11 @@ $Conf{GzipSchema} = '\\h_\\s_\\n';
 # default: 4.2Gb for DVD
 #
 #$Conf{ArchiveMediaSize} = 4200 * 1024 * 1024;
-$Conf{ArchiveMediaSize} = 4404019200;
 
 #
 # maximum size of one (uncompressed) file on archive medium (in bytes)
 # default: 2Gb - 2k for DVD
 #$Conf{ArchiveChunkSize} = (2048 - 2) * 1024 * 1024;
-$Conf{ArchiveChunkSize} = 2145386496;
 
 #
 # Temporary directory for ISO images (relative to install dir)

diff --git a/lib/BackupPC/CGI/BurnMedia.pm b/lib/BackupPC/CGI/BurnMedia.pm
index 1dc83a1..bf4dfaf 100644 (file)
--- a/lib/BackupPC/CGI/BurnMedia.pm
+++ b/lib/BackupPC/CGI/BurnMedia.pm
@@ -4,10 +4,7 @@ use strict;
 use BackupPC::CGI::Lib qw(:all);
 use BackupPC::Search;
 use Data::Dumper;
-use vars qw($Cgi %In $MyURL $User %Conf $TopDir $BinDir $bpc);
-
-my $dsn = $Conf{SearchDSN};
-my $db_user = $Conf{SearchUser} || '';
+use vars qw($Cgi %In $MyURL $User $TopDir $BinDir $bpc);
 
 sub action() {
        my $cont = "";
@@ -15,7 +12,10 @@ sub action() {
        my $subtitle;
        my @files;
 
-       my $dbh = DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 0 } );
+       $bpc->ConfigRead('_search_archive');
+       my %Conf = $bpc->Conf;
+
+       my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 } );
 
        BackupPC::CGI::Lib::NewRequest();
 #      $cont = Dumper(%In);

diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index b1b8bea..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;
 }