--- trunk/lib/BackupPC/SearchLib.pm 2005/08/21 13:44:20 55 +++ trunk/lib/BackupPC/SearchLib.pm 2005/08/21 14:26:23 58 @@ -179,6 +179,7 @@ files.dvdid IS NULL GROUP BY backups.hostID, backups.num, hosts.id + ORDER BY min(backups.date) }; my $sth = $dbh->prepare( $sql ); my @ret; @@ -186,11 +187,12 @@ while ( my $row = $sth->fetchrow_hashref() ) { push(@ret, { - 'host' => $row->{'host'}, - 'hostid' => $row->{'hostid'}, - 'backupno' => $row->{'backupno'}, - 'type' => $row->{'type'}, - 'date' => $row->{'date'} + 'host' => $row->{'host'}, + 'hostid' => $row->{'hostid'}, + 'backupno' => $row->{'backupno'}, + 'type' => $row->{'type'}, + 'date' => $row->{'date'}, + 'age' => sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) ), } ); } @@ -235,15 +237,24 @@ if ($addForm) { $retHTML .= ""; } - $retHTML .= qq{HostBackup noTypedate}; + $retHTML .= qq{ + Host + Backup no + Type + date + age/days + + }; my @backups = getBackupsNotBurned(); my $backup; if ($addForm) { - $retHTML .= qq{ + $retHTML .= qq{ + - }; + + }; } foreach $backup(@backups) { @@ -252,16 +263,17 @@ $retHTML .= ""; if ($addForm) { - $retHTML .= qq{{'backupno'} . - qq{" value="} . $backup->{'hostid'}."_".$backup->{'backupno'} . - qq{">}; + $retHTML .= ''; } $retHTML .= '' . $backup->{'host'} . '' . '' . $backup->{'backupno'} . '' . '' . $backup->{'type'} . '' . - '' . epoch_to_iso( $backup->{'date'} ) . '' . + '' . epoch_to_iso( $backup->{'date'} ) . '' . + '' . $backup->{'age'} . '' . ''; }