X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch.pm;h=2fd2f9839c7a9649cd08b0c96c068fbebaf2be76;hp=a0e19c307e33d49ae8f2cdfe17c0bdfea941f0fe;hb=1e64554b4812c6fccce5aa853aee8a7a6a85987f;hpb=9fecbd8a0fc6460ca8837c6b38dc9c03ed21c05e diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm index a0e19c3..2fd2f98 100644 --- a/lib/BackupPC/Search.pm +++ b/lib/BackupPC/Search.pm @@ -229,8 +229,8 @@ sub getFiles($) { # do we have to add tables for burned media? if ( $param->{burned} ) { $sql_from .= qq{ - LEFT OUTER JOIN archive_backup on archive_backup.backup_id = backups.id - LEFT OUTER JOIN archive_burned on archive_burned.archive_id = archive_backup.archive_id + LEFT OUTER JOIN archive_backup_parts on backup_id = backups.id + LEFT OUTER JOIN archive_burned on archive_burned.archive_id = archive_id }; } @@ -609,16 +609,16 @@ sub displayGrid($) { $sth_archived ||= $dbh->prepare(qq{ select - dvd_nr, note, + archive.dvd_nr, note, count(archive_burned.copy) as copies from archive inner join archive_burned on archive_burned.archive_id = archive.id - inner join archive_backup on archive.id = archive_backup.archive_id - inner join backups on backups.id = archive_backup.backup_id + inner join archive_backup_parts on archive.id = archive_backup_parts.archive_id + inner join backups on backups.id = archive_backup_parts.backup_id inner join hosts on hosts.id = backups.hostid inner join shares on shares.id = backups.shareid where hosts.name = ? and shares.name = ? and backups.num = ? - group by dvd_nr, note + group by archive.dvd_nr, note }); my @mediums;