X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch.pm;h=2fd2f9839c7a9649cd08b0c96c068fbebaf2be76;hp=f2dac44032b8a661042a284e18dbeedc25c63b8e;hb=1e64554b4812c6fccce5aa853aee8a7a6a85987f;hpb=1f12f5ba25530a04f3a5e7b86c3ac88d9526fe1d diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm index f2dac44..2fd2f98 100644 --- a/lib/BackupPC/Search.pm +++ b/lib/BackupPC/Search.pm @@ -229,8 +229,8 @@ sub getFiles($) { # do we have to add tables for burned media? if ( $param->{burned} ) { $sql_from .= qq{ - LEFT OUTER JOIN archive_backup on archive_backup.backup_id = backups.id - LEFT OUTER JOIN archive_burned on archive_burned.archive_id = archive_backup.archive_id + LEFT OUTER JOIN archive_backup_parts on backup_id = backups.id + LEFT OUTER JOIN archive_burned on archive_burned.archive_id = archive_id }; } @@ -374,35 +374,6 @@ sub getGzipSize($$) ); } -sub getVolumes($) { - my $id = shift; - - my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize"; - - my $sth = $dbh->prepare(qq{ - select - size - from backup_parts - where backup_id = ? - order by part_nr asc - }); - - $sth->execute($id); - - my $cumulative_size = 0; - my $volumes = 1; - - while(my ($size) = $sth->fetchrow_array) { - if ($cumulative_size + $size > $max_archive_size) { - $volumes++; - $cumulative_size = $size; - } else { - $cumulative_size += $size; - } - } - - return ($volumes,$cumulative_size); -} sub getBackupsNotBurned($) { @@ -414,36 +385,27 @@ sub getBackupsNotBurned($) { print STDERR "## sort=". ($param->{'sort'} || 'no sort param') . " burn sql order: $order\n"; my $sql = qq{ - SELECT - backups.hostID AS hostID, - hosts.name AS host, - shares.name AS share, - backups.num AS backupnum, - backups.type AS type, - backups.date AS date, - date_part('epoch',now()) - backups.date as age, - backups.size AS size, - backups.id AS id, - backups.inc_size AS inc_size, - backups.parts AS parts - 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.inc_size > 0 AND backups.size > 0 AND backups.inc_deleted is false AND archive_backup.backup_id IS NULL AND backups.parts > 0 - GROUP BY - backups.hostID, - hosts.name, - shares.name, - backups.num, - backups.shareid, - backups.id, - backups.type, - backups.date, - backups.size, - backups.inc_size, - backups.parts - ORDER BY $order + SELECT + p.id, + p.filename, + b.date, + date_part('epoch',now()) - b.date as age, + p.size, + count(ap.*) as scheduled, + count(ab.*) as burned + FROM backup_parts p + JOIN backups b ON b.id = p.backup_id + LEFT OUTER JOIN archive_parts ap ON ap.backup_part_id = p.id + LEFT OUTER JOIN archive_burned ab ON ab.archive_id = ap.archive_id + GROUP BY p.id,filename,b.date,age,p.size,p.part_nr + }; + + $sql .= qq{ + HAVING count(ap.*) = 0 + } unless $param->{scheduled}; + + $sql .= qq{ + ORDER BY b.date,p.part_nr }; my $sth = $dbh->prepare( $sql ); my @ret; @@ -452,15 +414,6 @@ print STDERR "## sort=". ($param->{'sort'} || 'no sort param') . " burn sql orde while ( my $row = $sth->fetchrow_hashref() ) { $row->{'age'} = sprintf("%0.1f", ( $row->{'age'} / 86400 ) ); #$row->{'age'} = sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) ); - - my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize"; - if ($row->{size} > $max_archive_size) { - ($row->{volumes}, $row->{inc_size_calc}) = getVolumes($row->{id}); - } - - # do some cluster calculation (approximate) - $row->{inc_size} = int(( ($row->{inc_size} + 1023 ) / 2 ) * 2); - $row->{inc_size_calc} ||= $row->{inc_size}; push @ret, $row; } @@ -472,496 +425,149 @@ sub displayBackupsGrid($) { my $param = shift; my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize"; - my $max_archive_file_size = $Conf{ArchiveChunkSize} || die "no MaxFileInSize"; - - my $retHTML .= q{ -
"; - - return $retHTML; -} - -sub displayGrid($) { - my ($param) = @_; - - my $offset = $param->{'offset'}; - my $hilite = $param->{'search_filename'}; - - my $retHTML = ""; - - my $start_t = time(); - - my ($results, $files); - if ($param->{'use_hest'} && length($hilite) > 0) { - ($results, $files) = getFilesHyperEstraier($param); - } else { - ($results, $files) = getFiles($param); - } - - my $dur_t = time() - $start_t; - my $dur = sprintf("%0.4fs", $dur_t); - - my ($from, $to) = (($offset * $on_page) + 1, ($offset * $on_page) + $on_page); - - if ($results <= 0) { - $retHTML .= qq{ -No results found...
- }; - return $retHTML; - } else { - # DEBUG - #use Data::Dumper; - #$retHTML .= '' . Dumper($files) . ''; - } - - - $retHTML .= qq{ -
- }; - - sub sort_header($$$$) { - my ($param, $display, $name, $align) = @_; - - my ($sort_what, $sort_direction) = split(/_/,$param->{'sort'},2); - - my $old_sort = $param->{'sort'}; - - my $html = qq{ | {'sort'} = $name . '_' . $direction; - $html .= ' style="border: 1px solid #808080;"'; - - # add unicode arrow for direction - $arrow .= ' '; - $arrow .= $direction eq 'a' ? '▲' - : $direction eq 'd' ? '▼' - : '' - ; - - } else { - $param->{'sort'} = $name . '_a'; - } - - $html .= '>' . $display . '' . $arrow . ' | '; - $param->{'sort'} = $old_sort; - - return $html; + + $html .= '>' . $display . '' . $arrow . ''; + $param->{'sort'} = $old_sort; + + return $html; } $retHTML .= @@ -1003,16 +609,16 @@ sub displayGrid($) { $sth_archived ||= $dbh->prepare(qq{ select - dvd_nr, note, + archive.dvd_nr, note, count(archive_burned.copy) as copies from archive inner join archive_burned on archive_burned.archive_id = archive.id - inner join archive_backup on archive.id = archive_backup.archive_id - inner join backups on backups.id = archive_backup.backup_id + inner join archive_backup_parts on archive.id = archive_backup_parts.archive_id + inner join backups on backups.id = archive_backup_parts.backup_id inner join hosts on hosts.id = backups.hostid inner join shares on shares.id = backups.shareid where hosts.name = ? and shares.name = ? and backups.num = ? - group by dvd_nr, note + group by archive.dvd_nr, note }); my @mediums; @@ -1031,113 +637,442 @@ sub displayGrid($) { return $html; } - my $i = $offset * $on_page; + my $i = $offset * $on_page; + + foreach $file (@{ $files }) { + $i++; + + my $typeStr = BackupPC::Attrib::fileType2Text(undef, $file->{'type'}); + $retHTML .= qq{|||||
$i | }; + + $retHTML .= + qq{} . $file->{'hname'} . ':' . $file->{'sname'} . qq{ | } . + qq{} . hilite_html( $file->{'filepath'}, $hilite ) . qq{ | } . + qq{} . restore_link( $typeStr, ${EscURI( $file->{'hname'} )}, $file->{'backupnum'}, ${EscURI( $file->{'sname'})}, ${EscURI( $file->{'filepath'} )}, $file->{'backupnum'} ) . qq{ | } . + qq{} . $file->{'size'} . qq{ | } . + qq{} . epoch_to_iso( $file->{'date'} ) . qq{ | } . + qq{} . check_archived( $file->{'hname'}, $file->{'sname'}, $file->{'backupnum'} ) . qq{ | }; + + $retHTML .= "