--- trunk/lib/BackupPC/SearchLib.pm	2005/10/10 13:04:48	155
+++ trunk/lib/BackupPC/SearchLib.pm	2005/10/10 13:39:13	161
@@ -337,12 +337,13 @@
 			backups.type AS type,
 			backups.date AS date,
 			backups.size AS size,
-			backups.id AS id
+			backups.id AS id,
+			backups.inc_size AS inc_size
 		FROM backups 
 		INNER JOIN shares	ON backups.shareID=shares.ID
 		INNER JOIN hosts	ON backups.hostID = hosts.ID
 		LEFT OUTER JOIN archive_backup ON archive_backup.backup_id = backups.id 
-		WHERE backups.size > 0 AND archive_backup.backup_id IS NULL
+		WHERE backups.size > 0 AND backups.inc_size > 0 AND archive_backup.backup_id IS NULL
 		GROUP BY
 		        backups.hostID,
 			hosts.name,
@@ -352,7 +353,8 @@
 			backups.id,
 			backups.type,
 			backups.date,
-			backups.size
+			backups.size,
+			backups.inc_size
 		ORDER BY backups.date
 	};
 	my $sth = $dbh->prepare( $sql );
@@ -362,10 +364,9 @@
 	while ( my $row = $sth->fetchrow_hashref() ) {
 		$row->{'age'} = sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) );
 		$row->{'size'} = sprintf("%0.2f", $row->{'size'} / 1024 / 1024);
-		my (undef,undef,undef,undef,undef,undef,undef,$fs_size,undef,undef,undef,undef,undef) = 
-	        	stat( $Conf{InstallDir}.'/'.$Conf{GzipTempDir}.'/'.
-	        		getGzipName($row->{'host'}, $row->{share}, $row->{'backupnum'}));
-		$row->{'fs_size'} = $fs_size;
+
+		# do some cluster calculation (approximate) and convert to kB
+		$row->{'inc_size'} = int($row->{'inc_size'} / ( 2 * 1024) * 2);
 		push @ret, $row;
 	}
       
@@ -688,7 +689,7 @@
 			<td align="center">date</td>
 			<td align="center">age/days</td>
 			<td align="center">size/MB</td>
-			<td align="center">gzip size</td>
+			<td align="center">gzip size/kB</td>
 			</tr>
 
 	};
@@ -712,10 +713,7 @@
 			'<tr' . $color[$i %2 ] . '>
 			<td class="fview">';
 
-		# FIXME
-		$backup->{'fs_size'} = int($backup->{'size'} * 1024);
-
-		if (($backup->{'fs_size'} || 0) > 0) {
+		if (($backup->{'inc_size'} || 0) > 0) {
 			$retHTML .= '
 			<input type="checkbox" name="fcb' . $checkbox_key . '" value="' . $checkbox_key . '" onClick="sumiraj(this);">';
 		}
@@ -728,8 +726,8 @@
 			'<td align="center">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
 			'<td align="center">' . $backup->{'age'} . '</td>' .
 			'<td align="right">' . $backup->{'size'} . '</td>' .
-			'<td align="right">' . $backup->{'fs_size'} .
-			'<input type="hidden" iD="fss'.$checkbox_key .'" value="'. $backup->{'fs_size'} .'"></td>' .
+			'<td align="right">' . $backup->{'inc_size'} .
+			'<input type="hidden" iD="fss'.$checkbox_key .'" value="'. $backup->{'inc_size'} .'"></td>' .
 
 			"</tr>\n";
 	}