--- trunk/lib/BackupPC/SearchLib.pm	2005/08/25 11:41:58	72
+++ trunk/lib/BackupPC/SearchLib.pm	2005/08/26 23:37:10	79
@@ -32,10 +32,9 @@
 
 sub epoch_to_iso {
 	my $t = shift || return;
-	$t += 60 * 60 * +2;	# FIXME add TZ
-	my $dt = DateTime->from_epoch( epoch => $t ) || return;
-	print STDERR "BUG: $t != " . $dt->epoch . "\n" unless ($t == $dt->epoch);
-	return $dt->ymd . ' ' . $dt->hms;
+	my $iso = BackupPC::Lib::timeStamp($t);
+	$iso =~ s/\s/ /g;
+	return $iso;
 }
 
 sub getWhere($) {
@@ -98,7 +97,8 @@
 		files.date			AS date,
 		files.type			AS filetype,
 		files.size			AS size,
-		dvds.name			AS dvd
+		-- dvds.name			AS dvd
+		null				AS dvd
 	};
 
 	my $sql_from = qq{
@@ -109,7 +109,7 @@
 	};
 
 	my $sql_dvd_from = qq{
-			LEFT  JOIN dvds		ON dvds.ID = files.dvdid
+			-- LEFT  JOIN dvds		ON dvds.ID = files.dvdid
 	};
 
 	my $sql_where;
@@ -175,8 +175,10 @@
 		min(backups.type)	AS type,
 		min(backups.date)	AS date,
 		min(backups.size)	AS size
-	FROM backups
-		INNER JOIN hosts	ON hosts.ID = backups.hostID
+	FROM files 
+		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 AND backups.shareID = shares.ID
 	WHERE 
 		files.dvdid	IS NULL
 	GROUP BY 
@@ -228,18 +230,21 @@
               $retHTML.= q{<input type="hidden" value="burn" name="action">};
               $retHTML .= q{<input type="hidden" value="results" name="search_results">};
 	}
-	$retHTML .= qq{<table style="fview"><tr>};
+	$retHTML .= qq{
+		<table style="fview" border="1" cellspacing="1" cellpadding="3">
+		<tr class="tableheader">
+	};
 
 	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>
-		<td class="tableheader">age/days</td>
-		<td class="tableheader">size/MB</td>
+		<td align="center">Host</td>
+		<td align="center">Backup no</td>
+		<td align="center">Type</td>
+		<td align="center">date</td>
+		<td align="center">age/days</td>
+		<td align="center">size/MB</td>
 		</tr>
 	};
 
@@ -317,16 +322,17 @@
 
 
 	$retHTML .= qq{
-	<br/>Found <b>$results files</b> showing <b>$from - $to</b> (took $dur)
-      	<table style="fview" width="100%">
-		<tr> 
-		<td class="tableheader">Share</td>
-		<td class="tableheader">Name</td>
-		<td class="tableheader">Type</td>
-		<td class="tableheader">#</td>
-		<td class="tableheader">Size</td>
-		<td class="tableheader">Date</td>
-		<td class="tableheader">Media</td>
+	<div>
+	Found <b>$results files</b> showing <b>$from - $to</b> (took $dur)
+	</div>
+      	<table style="fview" width="100%" border="0" cellpadding="2" cellspacing="0">
+		<tr class="fviewheader"> 
+		<td align="center">Share</td>
+		<td align="center">Type and Name</td>
+		<td align="center">#</td>
+		<td align="center">Size</td>
+		<td align="center">Date</td>
+		<td align="center">Media</td>
 		</tr>
 	};
 
@@ -347,19 +353,15 @@
 
 	foreach $file (@{ $files }) {
 		my $typeStr  = BackupPC::Attrib::fileType2Text(undef, $file->{'type'});
-		$retHTML .= "<tr>";
+		$retHTML .= qq{<tr class="fviewborder">};
 
-		foreach my $v ((
-			$file->{'sharename'},
-			qq{<img src="$Conf{CgiImageDirURL}/icon-$typeStr.gif" align="center">&nbsp;} . hilite_html( $file->{'fpath'}, $hilite ),
-			$typeStr,
-			restore_link( $typeStr, $file->{'hname'}, $file->{'backupno'}, $file->{'sname'}, $file->{'fpath'}, $file->{'backupno'} ),
-			$file->{'size'},
-			epoch_to_iso( $file->{'date'} ),
-			$file->{'dvd'}
-		)) {
-			$retHTML .= qq{<td class="fviewborder">$v</td>};
-		}
+		$retHTML .=
+			qq{<td class="fviewborder" align="right">} . $file->{'sharename'} . qq{</td>} .
+			qq{<td class="fviewborder"><img src="$Conf{CgiImageDirURL}/icon-$typeStr.gif" alt="$typeStr">&nbsp;} . hilite_html( $file->{'fpath'}, $hilite ) . qq{</td>} .
+			qq{<td class="fviewborder" align="center">} . restore_link( $typeStr, ${EscURI( $file->{'hname'} )}, $file->{'backupno'}, ${EscURI( $file->{'sname'})}, ${EscURI( $file->{'fpath'} )}, $file->{'backupno'} ) . qq{</td>} .
+			qq{<td class="fviewborder" align="right">} . $file->{'size'} . qq{</td>} .
+			qq{<td class="fviewborder">} . epoch_to_iso( $file->{'date'} ) . qq{</td>} .
+			qq{<td class="fviewborder">} . $file->{'dvd'} . qq{</td>};
 
 		$retHTML .= "</tr>";
 	}