--- trunk/lib/BackupPC/SearchLib.pm	2005/08/30 22:42:22	101
+++ trunk/lib/BackupPC/SearchLib.pm	2005/08/30 22:43:01	102
@@ -248,6 +248,7 @@
 	SELECT
 		backups.hostID		AS hostid,
 		min(hosts.name)		AS host,
+		min(shares.name)	AS share,
 		backups.num		AS backupnum,
 		min(backups.type)	AS type,
 		min(backups.date)	AS date,
@@ -257,7 +258,7 @@
 		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
 	GROUP BY 
-		backups.hostID, backups.num
+		backups.hostID, backups.num, backups.shareid
 	ORDER BY min(backups.date)
 	};
 	my $sth = $dbh->prepare( $sql );
@@ -276,11 +277,8 @@
 sub displayBackupsGrid()
   {
       my $retHTML = "";
-      my $addForm = 1;
       
-      if ($addForm) {
-
-	    $retHTML .= <<EOF3;
+	$retHTML .= <<EOF3;
 <script language="javascript" type="text/javascript">
 <!--
 
@@ -301,65 +299,61 @@
 //-->
 </script>      
 EOF3
-	      $retHTML .= q{<form name="forma" method="GET" action="}."$MyURL"."?action=burn\"";
-              $retHTML.= q{<input type="hidden" value="burn" name="action">};
-              $retHTML .= q{<input type="hidden" value="results" name="search_results">};
-	}
-	$retHTML .= qq{
-		<table style="fview" border="1" cellspacing="0" cellpadding="3">
+	$retHTML .= q{
+		<form name="forma" method="GET" action="$MyURL?action=burn">
+		<input type="hidden" value="burn" name="action">
+		<input type="hidden" value="results" name="search_results">
+		<table style="fview" border="0" cellspacing="0" cellpadding="2">
 		<tr class="tableheader">
-	};
-
-	if ($addForm) {
-	    $retHTML .= "<td class=\"tableheader\"><input type=\"checkbox\" name=\"allFiles\" onClick=\"checkAll('allFiles');\"></td>";
-	}
-	$retHTML .=  qq{
-		<td align="center">Host</td>
+		<td class="tableheader">
+			<input type="checkbox" name="allFiles" onClick="checkAll('allFiles');">
+		</td>
+		<td align="center">Share</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>
+
+		<tr><td colspan=7 style="tableheader">
+		<input type="submit" value="Burn selected backups on medium" name="submitBurner">
+		</td></tr>
 	};
 
-	my @backups = getBackupsNotBurned();
-	my $backup;
+	my @color = (' bgcolor="#e0e0e0"', '');
 
-	if ($addForm) {
-		$retHTML .= qq{
-			<tr><td colspan=7 style="tableheader">
-			<input type="submit" value="Burn selected backups on medium" name="submitBurner">
-			</td></tr>
-		};
-	}
+	my $i = 0;
+	my $host = '';
 
-	foreach $backup(@backups) {
+	foreach my $backup ( getBackupsNotBurned() ) {
 
+		if ($host ne $backup->{'host'}) {
+			$i++;
+			$host = $backup->{'host'};
+		}
 		my $ftype = "";
 	    
-		$retHTML .= "<tr>";
-		if ($addForm) {
-			$retHTML .= '<td class="fview"><input type="checkbox" name="fcb' .
+		$retHTML .= "<tr" . $color[$i %2 ] . ">";
+		$retHTML .= '<td class="fview"><input type="checkbox" name="fcb' .
 				$backup->{'hostid'}.'_'.$backup->{'backupnum'} . 
 				'" value="' . $backup->{'hostid'}.'_'.$backup->{'backupnum'} .
 				'"></td>';
-		}	    
 	    
-		$retHTML .= '<td class="fviewborder">' . $backup->{'host'} . '</td>' .
-			'<td class="fviewborder">' . $backup->{'backupnum'} . '</td>' .
-			'<td class="fviewborder">' . $backup->{'type'} . '</td>' .
-			'<td class="fviewborder">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
-			'<td class="fviewborder">' . $backup->{'age'} . '</td>' .
-			'<td class="fviewborder">' . $backup->{'size'} . '</td>' .
-			'</tr>';
-	}
+		$retHTML .=
+			'<td align="right">' . $backup->{'host'} . ':' . $backup->{'share'} . '</td>' .
+			'<td align="center">' . $backup->{'backupnum'} . '</td>' .
+			'<td align="center">' . $backup->{'type'} . '</td>' .
+			'<td align="center">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
+			'<td align="center">' . $backup->{'age'} . '</td>' .
+			'<td align="right">' . $backup->{'size'} . '</td>' .
+			"</tr>\n";
 
-	$retHTML .= "</table>";
 
-	if ($addForm) {
-		$retHTML .= "</form>";
 	}
+
+	$retHTML .= "</table>";
+	$retHTML .= "</form>";
       
 	return $retHTML;
 }