check also number of backup_parts, display date of backup

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@294 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/bin/BackupPC_incPartsUpdate b/bin/BackupPC_incPartsUpdate
index d602fd8..ead9137 100755 (executable)
--- a/bin/BackupPC_incPartsUpdate
+++ b/bin/BackupPC_incPartsUpdate
@@ -378,13 +378,17 @@ select
        hosts.name as host,
        shares.name as share,
        backups.num as num,
+       backups.date,
        inc_size,
-       parts
+       parts,
+       count(backup_parts.backup_id) as backup_parts
 from backups
        join shares on backups.hostid = shares.hostid
                and shares.id = backups.shareid
        join hosts on shares.hostid = hosts.id
+       full outer join backup_parts on backups.id = backup_parts.backup_id
 where not inc_deleted
+group by backups.id, hosts.name, shares.name, backups.num, backups.date, inc_size, parts, backup_parts.backup_id
 order by backups.date
 
 } );
@@ -413,7 +417,7 @@ while (my $row = $sth->fetchrow_hashref) {
 
        print "# size: $size backup.size: ", $row->{inc_size},"\n" if ($opt{d});
 
-       if ( $row->{'inc_size'} != -1 && $size != -1 && $row->{'inc_size'} >= $size) {
+       if ( $row->{'inc_size'} != -1 && $size != -1 && $row->{'inc_size'} >= $size && $row->{parts} == $row->{backup_parts}) {
                if ($check) {
                        tar_check($row->{'host'}, $row->{'share'}, $row->{'num'}, $tar_file) && next;
                } else {
@@ -421,7 +425,8 @@ while (my $row = $sth->fetchrow_hashref) {
                }
        }
 
-       print curr_time, " creating $curr_backup/$num_backups ", $row->{'host'}, ":", $row->{'share'}, " #", $row->{'num'}, " -> $tar_file";
+       print curr_time, " creating $curr_backup/$num_backups ", $row->{host}, ":", $row->{share}, " #", $row->{num},
+               " ", strftime('%Y-%m-%d', localtime($row->{date})), " -> $tar_file";
 
        my $t = time();