--- trunk/lib/BackupPC/SearchLib.pm	2005/08/20 17:19:48	53
+++ trunk/lib/BackupPC/SearchLib.pm	2005/08/21 14:26:23	58
@@ -7,6 +7,7 @@
 use DBI;
 use DateTime;
 use vars qw(%In $MyURL);
+use Time::HiRes qw/time/;
 
 my $on_page = 100;
 my $pager_pages = 10;
@@ -98,6 +99,9 @@
 		files.date			AS date,
 		files.type			AS filetype,
 		files.size			AS size,
+	};
+
+	my $sql_dvd_cols = qq{
 		dvds.name			AS dvd
 	};
 
@@ -106,6 +110,9 @@
 			INNER JOIN shares	ON files.shareID=shares.ID
 			INNER JOIN hosts	ON hosts.ID = shares.hostID
 			INNER JOIN backups	ON backups.num = files.backupNum and backups.hostID = hosts.ID
+	};
+
+	my $sql_dvd_from = qq{
 			LEFT  JOIN dvds		ON dvds.ID = files.dvdid
 	};
 
@@ -126,7 +133,7 @@
 
 	my ($results) = $sth->fetchrow_array();
 
-	$sth = $dbh->prepare(qq{ select $sql_cols $sql_from $sql_where $sql_order });
+	$sth = $dbh->prepare(qq{ select $sql_cols $sql_dvd_cols $sql_from $sql_dvd_from $sql_where $sql_order });
 	$sth->execute( $offset );
 
 	my @ret;
@@ -172,6 +179,7 @@
 		files.dvdid	IS NULL
 	GROUP BY 
 		backups.hostID, backups.num, hosts.id
+	ORDER BY min(backups.date)
 	};
 	my $sth = $dbh->prepare( $sql );
 	my @ret;
@@ -179,11 +187,12 @@
 
 	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 ) ),
 		       }
 		);
 	}
@@ -228,15 +237,24 @@
 	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) {
@@ -245,16 +263,17 @@
 	    
 		$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>';
 	}
 
@@ -277,12 +296,17 @@
 		$retHTML .= qq{<input type="hidden" value="results" name="search_results">};
 	}
 
+	my $start_t = time();
+
 	my ($results, $files) = getFiles($where, $offset);
 
+	my $dur_t = time() - $start_t;
+	my $dur = sprintf("%0.4fs", $dur_t);
+
 	my ($from, $to) = (($offset * $on_page) + 1, ($offset * $on_page) + $on_page);
 
 	$retHTML .= qq{
-	<br/>Found $results files, showing $from - $to
+	<br/>Found <b>$results files</b> showing <b>$from - $to</b> (took $dur)
       	<table style="fview" width="100%">
 		<tr> 
 		<td class="tableheader">Share</td>