--- trunk/lib/BackupPC/SearchLib.pm	2005/07/11 11:51:09	16
+++ trunk/lib/BackupPC/SearchLib.pm	2005/07/11 13:22:38	17
@@ -320,66 +320,72 @@
   
   }      
 
-sub displayGrid($$$)
-  {
-      my ($where, $addForm, $offset) = @_;
-      my $retHTML = "";
-      
-      if ($addForm)
-	{
- 	      $retHTML .= q{<form name="forma" method="POST" action="}."$MyURL"."?action=search\"";
-              $retHTML.= q{<input type="hidden" value="search" name="action">};
-              $retHTML .= q{<input type="hidden" value="results" name="search_results">};
+sub displayGrid($$$$) {
+	my ($where, $addForm, $offset, $hilite) = @_;
+	my $retHTML = "";
+ 
+	if ($addForm) {
+		$retHTML .= qq{<form name="forma" method="POST" action="}.$MyURL.qq{?action=search">};
+		$retHTML.= qq{<input type="hidden" value="search" name="action">};
+		$retHTML .= qq{<input type="hidden" value="results" name="search_results">};
+	}
+	$retHTML .= qq{
+      	<table style="fview" width="100%">
+		<tr> 
+		<td class="tableheader">Host</td>
+		<td class="tableheader">Type</td>
+		<td class="tableheader">Name</td>
+		<td class="tableheader">backup no.</td>
+		<td class="tableheader">size</td>
+		<td class="tableheader">date</td>
+		<td class="tableheader">Media</td>
+		</tr>
+	};
+	my @files = getFiles($where, $offset);
+	my $file;
+
+	sub hilite_html($$) {
+		my ($html, $search) = @_;
+		$html =~ s#($search)#<b>$1</b>#gis;
+		return $html;
 	}
-      $retHTML .= "<table style=\"fview\">";
-      $retHTML .= "<tr> ";
-      $retHTML .=  "<td class=\"tableheader\">Host</td> <td class=\"tableheader\">Name</td> <td class=\"tableheader\">Type</td> <td class=\"tableheader\">backup no.</td> <td class=\"tableheader\">size</td> <td class=\"tableheader\">date</td>  <td class=\"tableheader\">Media</td></tr>";
-      my @files = getFiles($where, $offset);
-      my $file;
-
-      foreach $file(@files)
-	{
-	    my $ftype = "";
-	    
-	    if ($file->{'type'} == BPC_FTYPE_DIR)
-	      {
-		  $ftype = "dir";
-	      }
-	    else
-	      {
-		  $ftype = "file";
-	      }
-	    $retHTML .= "<tr>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $file->{'hname'} ."</td>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $file->{'fname'} . "</td>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $ftype . "</td>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $file->{'backupno'} . "</td>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $file->{'size'} . "</td>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $file->{'date'} . "</td>";
-	    $retHTML .= "<td class=\"fviewborder\">" . $file->{'dvd'} . "</td>";
-	    $retHTML .= "</tr>";
+
+	foreach $file (@files) {
+		my $ftype = "file";
+		$ftype = "dir" if ($file->{'type'} == BPC_FTYPE_DIR);
+
+		$retHTML .= "<tr>";
+
+		foreach my $v ((
+			$file->{'hname'},
+			$ftype,
+			hilite_html( $file->{'fpath'}, $hilite ),
+			$file->{'backupno'},
+			$file->{'size'},
+			$file->{'date'},
+			$file->{'dvd'}
+		)) {
+			$retHTML .= qq{<td class="fviewborder">$v</td>};
+		}
+
+		$retHTML .= "</tr>";
 	}
-      $retHTML .= "</table>";
+	$retHTML .= "</table>";
+
+	# skip pager
+	return $retHTML;
 
-       
+	$retHTML .= "<INPUT TYPE=\"hidden\" VALUE=\"\" NAME=\"offset\">";
+	for (my $ii = 1; $ii <= $#files; $ii++) {
+		$retHTML .= "<a href = \"#\" onclick=\"document.forma.offset.value=$ii;document.forma.submit();\">$ii</a>";
+		if ($ii < $#files) {
+			$retHTML .= " | ";
+		}
+	}
 
-      $retHTML .= "<INPUT TYPE=\"hidden\" VALUE=\"\" NAME=\"offset\">";
-      for (my $ii = 1; $ii <= $#files; $ii++)
-      {
-	  $retHTML .= "<a href = \"#\" onclick=\"document.forma.offset.value=$ii;document.forma.submit();\">$ii</a>";
-	  if ($ii < $#files)
-	    {
-		$retHTML .= " | ";
-	    }
-      }
-
-
-       if ($addForm)
-       {
-	   $retHTML .= "</form>";
-       }
+	$retHTML .= "</form>" if ($addForm);
       
-      return $retHTML;
-  }
+	return $retHTML;
+}
 
 1;