X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=bin%2FBackupPC_ASA_PostArchive_Update;h=50d9cc902a94dc3579a7da16b0dbff2e9d86c237;hb=730841807f5da0e0626be75a4d2e828b7584057f;hp=8d69bf633febf5c79a974944c7ccb583ba01bbe3;hpb=6e361dfbcfd712fd68d507a90cf3a0b5f7a089cd;p=BackupPC.git

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index 8d69bf6..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;
 	}
 
@@ -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(