store filename in backup_parts
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 28 Jan 2011 14:24:38 +0000 (15:24 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 28 Jan 2011 14:24:38 +0000 (15:24 +0100)
bin/BackupPC_ASA_PostArchive_Update
bin/BackupPC_ASA_SearchUpdate

index 8b31d6f..50d9cc9 100755 (executable)
@@ -183,16 +183,16 @@ sub check_archive {
        }
 
        sub check_part {
        }
 
        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
                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
                        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 (
 
                if (my $row = $sth_md5->fetchrow_hashref) {
                        return if (
@@ -212,11 +212,12 @@ sub check_archive {
                                tar_size,
                                size,
                                md5,
                                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;
        }
 
                $dbh->commit;
        }
 
@@ -298,7 +299,7 @@ sub check_archive {
                my $items = 1;
                $part_nr++;
 
                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 ) * 2048);
 
                # round increment size to 2k block size
                $inc_size += int((($size + 2048) / 2048 ) * 2048);
index 279b8b0..e691bd8 100755 (executable)
@@ -304,6 +304,7 @@ if ($opt->create) {
                        md5 text not null,
                        items int not null check (items > 0),
                        date timestamp default now(),
                        md5 text not null,
                        items int not null check (items > 0),
                        date timestamp default now(),
+                       filename text not null,
                        primary key(id)
                );
 
                        primary key(id)
                );