X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_ASA_PostArchive_Update;h=50d9cc902a94dc3579a7da16b0dbff2e9d86c237;hp=3d531eeb16994977c896e594324baa1505feb3d2;hb=74baa820fab5e1a03551526f0e9e671d9f74de03;hpb=cc890fbe5f86ff57159bf2fbdabc52e163a729f5

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index 3d531ee..50d9cc9 100755
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -183,16 +183,16 @@ sub check_archive {
 	}
 
 	sub check_part {
-		my ($host, $num, $part_nr, $tar_size, $size, $md5, $items) = @_;
+		my ($host, $num, $part_nr, $tar_size, $size, $md5, $items, $filename) = @_;
 		my $backup_id = get_backup_id($host, $num);
 		my $sth_md5 = $dbh->prepare(qq{
 			select
-				id, tar_size, size, md5, items
+				id, tar_size, size, md5, items, filename
 			from backup_parts
-			where backup_id = ? and part_nr = ?
+			where backup_id = ? and part_nr = ? and filename = ?
 		});
 
-		$sth_md5->execute($backup_id, $part_nr);
+		$sth_md5->execute($backup_id, $part_nr, $filename);
 
 		if (my $row = $sth_md5->fetchrow_hashref) {
 			return if (
@@ -212,11 +212,12 @@ sub check_archive {
 				tar_size,
 				size,
 				md5,
-				items
-			) values (?,?,?,?,?,?)
+				items,
+				filename
+			) values (?,?,?,?,?,?,?)
 		});
 
-		$sth_insert->execute($backup_id, $part_nr, $tar_size, $size, $md5, $items);
+		$sth_insert->execute($backup_id, $part_nr, $tar_size, $size, $md5, $items, $filename);
 		$dbh->commit;
 	}
 
@@ -242,8 +243,8 @@ sub check_archive {
 
 		my $size = (stat( $path ))[7] || die "can't stat $path: $!";
 
-		if ($size > $Conf{MaxArchiveSize}) {
-			print ", part bigger than media $size > $Conf{MaxArchiveSize}\n";
+		if ($size > $Conf{ArchiveMediaSize}) {
+			print ", part bigger than media $size > $Conf{ArchiveMediaSize}\n";
 			return 0;
 		}
 
@@ -263,8 +264,8 @@ sub check_archive {
 			$items++;
 			$tar_size_inarc += $entry->size;
 
-			if ($tar_size_inarc > $Conf{MaxArchiveFileSize}) {
-				print ", part $filename is too big $tar_size_inarc > $Conf{MaxArchiveFileSize}\n";
+			if ($tar_size_inarc > $Conf{ArchiveChunkSize}) {
+				print ", part $filename is too big $tar_size_inarc > $Conf{ArchiveChunkSize}\n";
 				return 0;
 			}
 
@@ -298,10 +299,10 @@ sub check_archive {
 		my $items = 1;
 		$part_nr++;
 
-		check_part($host, $num, $part_nr, $tar_size, $size, $md5, $items);
+		check_part($host, $num, $part_nr, $tar_size, $size, $md5, $items, $filename);
 
 		# round increment size to 2k block size
-		$inc_size += int(($size + 2048) / 2048);
+		$inc_size += int((($size + 2048) / 2048 ) * 2048);
 	}
 
 	$sth_inc_size->execute(