--- trunk/lib/BackupPC/SearchLib.pm	2005/08/20 17:19:48	53
+++ trunk/lib/BackupPC/SearchLib.pm	2005/08/21 13:44:20	55
@@ -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;
@@ -277,12 +284,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>