From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 30 Jan 2011 13:07:10 +0000 (+0100)
Subject: archive_backup renamed to archive_backup_parts
X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=1e64554b4812c6fccce5aa853aee8a7a6a85987f;hp=9fecbd8a0fc6460ca8837c6b38dc9c03ed21c05e

archive_backup renamed to archive_backup_parts
---

diff --git a/bin/BackupPC_ASA_SearchUpdate b/bin/BackupPC_ASA_SearchUpdate
index cb2dcd1..929e848 100755
--- a/bin/BackupPC_ASA_SearchUpdate
+++ b/bin/BackupPC_ASA_SearchUpdate
@@ -710,8 +710,8 @@ create table archive_burned (
 --from backups
 --join shares on backups.shareid=shares.id
 --join hosts on shares.hostid = hosts.id
---left outer join archive_backup on backups.id = archive_backup.backup_id
---left outer join archive on archive_backup.archive_id = archive.id
+--left outer join archive_backup_parts on backups.id = archive_backup_parts.backup_id
+--left outer join archive on archive_backup_parts.archive_id = archive.id
 --where backups.parts > 0 and size > 0
 --order by backups.date
 --;
diff --git a/bin/BackupPC_ASA_removeBurnedArchives b/bin/BackupPC_ASA_removeBurnedArchives
index 798b1fa..38627d6 100755
--- a/bin/BackupPC_ASA_removeBurnedArchives
+++ b/bin/BackupPC_ASA_removeBurnedArchives
@@ -20,8 +20,8 @@ my $sql = q{
 	FROM backups
 		INNER JOIN hosts ON (hosts.id=backups.hostid)
 		INNER JOIN shares ON (shares.id=backups.shareid)
-		INNER JOIN archive_backup ON (archive_backup.backup_id=backups.id)
-		INNER JOIN archive_burned ON (archive_burned.archive_id=archive_backup.archive_id)
+		INNER JOIN archive_backup_parts ON (archive_backup_parts.backup_id=backups.id)
+		INNER JOIN archive_burned ON (archive_burned.archive_id=archive_backup_parts.archive_id)
 	GROUP BY 1, 2, 3
 	HAVING MAX(archive_burned.copy)>=2;
 };
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;