X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch.pm;h=b1b8bea1e57a035157ebd9dfc52f966752b7f19a;hp=43587dcf4e7d334d029d94dc5ff2a979645225cc;hb=6e361dfbcfd712fd68d507a90cf3a0b5f7a089cd;hpb=34090ca531b2884cc67af016548fed67f398507e

diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index 43587dc..b1b8bea 100644
--- a/lib/BackupPC/Search.pm
+++ b/lib/BackupPC/Search.pm
@@ -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">