From 94cca1fb0bf227d16a34786f9c5cb66211923261 Mon Sep 17 00:00:00 2001
From: dpavlin <dpavlin@8392b6e1-25fa-0310-8288-cc32f8e212ea>
Date: Sun, 21 Aug 2005 14:26:23 +0000
Subject: [PATCH] burn media now sorts by start date and display age (in days)

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@58 8392b6e1-25fa-0310-8288-cc32f8e212ea
---
 lib/BackupPC/SearchLib.pm | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/BackupPC/SearchLib.pm b/lib/BackupPC/SearchLib.pm
index 4965a86..07a43cf 100644
--- a/lib/BackupPC/SearchLib.pm
+++ b/lib/BackupPC/SearchLib.pm
@@ -179,6 +179,7 @@ sub getBackupsNotBurned() {
 		files.dvdid	IS NULL
 	GROUP BY 
 		backups.hostID, backups.num, hosts.id
+	ORDER BY min(backups.date)
 	};
 	my $sth = $dbh->prepare( $sql );
 	my @ret;
@@ -186,11 +187,12 @@ sub getBackupsNotBurned() {
 
 	while ( my $row = $sth->fetchrow_hashref() ) {	    
 		push(@ret, { 
-			 'host'     => $row->{'host'},
-			 'hostid'   => $row->{'hostid'},
-		         'backupno' => $row->{'backupno'},
-		         'type'     => $row->{'type'},
-		         'date'     => $row->{'date'}
+			 'host'		=> $row->{'host'},
+			 'hostid'	=> $row->{'hostid'},
+		         'backupno'	=> $row->{'backupno'},
+		         'type'		=> $row->{'type'},
+		         'date'		=> $row->{'date'},
+			 'age'		=> sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) ),
 		       }
 		);
 	}
@@ -235,15 +237,24 @@ EOF3
 	if ($addForm) {
 	    $retHTML .= "<td class=\"tableheader\"><input type=\"checkbox\" name=\"allFiles\" onClick=\"checkAll('allFiles');\"></td>";
 	}
-	$retHTML .=  qq{<td class="tableheader">Host</td><td class="tableheader">Backup no</td><td class="tableheader">Type</td><td class="tableheader">date</td></tr>};
+	$retHTML .=  qq{
+		<td class="tableheader">Host</td>
+		<td class="tableheader">Backup no</td>
+		<td class="tableheader">Type</td>
+		<td class="tableheader">date</td>
+		<td class="tableheader">age/days</td>
+		</tr>
+	};
 
 	my @backups = getBackupsNotBurned();
 	my $backup;
 
 	if ($addForm) {
-		$retHTML .= qq{<tr><td colspan=7 style="tableheader">
+		$retHTML .= qq{
+			<tr><td colspan=7 style="tableheader">
 			<input type="submit" value="Burn selected backups on medium" name="submitBurner">
-			</td></tr>};
+			</td></tr>
+		};
 	}
 
 	foreach $backup(@backups) {
@@ -252,16 +263,17 @@ EOF3
 	    
 		$retHTML .= "<tr>";
 		if ($addForm) {
-			$retHTML .= qq{<td class="fview"><input type="checkbox" name="fcb} .
-				$backup->{'hostid'}."_".$backup->{'backupno'} . 
-				qq{" value="} . $backup->{'hostid'}."_".$backup->{'backupno'} .
-				qq{"></td>};
+			$retHTML .= '<td class="fview"><input type="checkbox" name="fcb' .
+				$backup->{'hostid'}.'_'.$backup->{'backupno'} . 
+				'" value="' . $backup->{'hostid'}.'_'.$backup->{'backupno'} .
+				'"></td>';
 		}	    
 	    
 		$retHTML .= '<td class="fviewborder">' . $backup->{'host'} . '</td>' .
 			'<td class="fviewborder">' . $backup->{'backupno'} . '</td>' .
 			'<td class="fviewborder">' . $backup->{'type'} . '</td>' .
-			'<td class="fviewborder">' . epoch_to_iso( $backup->{'date'} ) . '<td>' .
+			'<td class="fviewborder">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
+			'<td class="fviewborder">' . $backup->{'age'} . '</td>' .
 			'</tr>';
 	}
 
-- 
2.20.1