--- trunk/lib/BackupPC/SearchLib.pm 2005/08/28 12:35:59 86 +++ trunk/lib/BackupPC/SearchLib.pm 2005/09/01 18:30:51 109 @@ -62,25 +62,34 @@ sub mk_epoch_date($$) { my ($name,$suffix) = @_; - my $yyyy = $param->{ $name . '_year_' . $suffix} || return; + my $yyyy = $param->{ $name . '_year_' . $suffix} || return undef; my $mm .= $param->{ $name . '_month_' . $suffix} || ( $suffix eq 'from' ? 1 : 12); my $dd .= $param->{ $name . '_day_' . $suffix} || ( $suffix eq 'from' ? 1 : 31); + + $yyyy =~ s/\D//g; + $mm =~ s/\D//g; + $dd =~ s/\D//g; + my $dt = new DateTime( year => $yyyy, month => $mm, day => $dd ); + print STDERR "mk_epoch_date($name,$suffix) [$yyyy-$mm-$dd] = " . $dt->ymd . " " . $dt->hms . "\n"; return $dt->epoch || 'NULL'; } - return ( + my @ret = ( mk_epoch_date('search_backup', 'from'), mk_epoch_date('search_backup', 'to'), mk_epoch_date('search', 'from'), mk_epoch_date('search', 'to'), ); + + return @ret; + } @@ -104,8 +113,11 @@ } -sub getFiles($$) { - my ($param, $offset) = @_; +sub getFiles($) { + my ($param) = @_; + + my $offset = $param->{'offset'} || 0; + $offset *= $on_page; my $dbh = get_dbh(); @@ -113,26 +125,18 @@ files.id AS fid, hosts.name AS hname, shares.name AS sname, - -- shares.share AS sharename, files.backupnum AS backupnum, - -- files.name AS filename, files.path AS filepath, files.date AS date, files.type AS type, - files.size AS size, - -- dvds.name AS dvd - null AS dvd + files.size AS size }; my $sql_from = qq{ FROM files INNER JOIN shares ON files.shareID=shares.ID 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 - }; - - my $sql_dvd_from = qq{ - -- LEFT JOIN dvds ON dvds.ID = files.dvdid + INNER JOIN backups ON backups.num = files.backupnum and backups.hostID = hosts.ID AND backups.shareID = files.shareID }; my $sql_where; @@ -146,10 +150,7 @@ }; my $sql_count = qq{ select count(files.id) $sql_from $sql_where }; - my $sql_results = qq{ select $sql_cols $sql_from $sql_dvd_from $sql_where $sql_order }; - - $offset ||= 0; - $offset = ($offset * $on_page); + my $sql_results = qq{ select $sql_cols $sql_from $sql_where $sql_order }; my $sth = $dbh->prepare($sql_count); $sth->execute(); @@ -174,8 +175,11 @@ return ($results, \@ret); } -sub getFilesHyperEstraier($$) { - my ($param, $offset) = @_; +sub getFilesHyperEstraier($) { + my ($param) = @_; + + my $offset = $param->{'offset'} || 0; + $offset *= $on_page; die "no index_path?" unless ($index_path); @@ -191,25 +195,24 @@ my $q = $param->{'search_filename'}; my $shareid = $param->{'search_share'}; - if ($q) { - $q =~ s/(.)/$1 /g; + if (length($q) > 0) { + # exact match + $cond->add_attr("filepath ISTRINC $q"); + $q =~ s/(.)/$1 /g; # set the search phrase to the search condition object $cond->set_phrase($q); + } - my ($backup_from, $backup_to, $files_from, $files_to) = dates_from_form($param); - - $cond->add_attr("backup_date NUMGE $backup_from") if ($backup_from); - $cond->add_attr("backup_date NUMLE $backup_to") if ($backup_to); + my ($backup_from, $backup_to, $files_from, $files_to) = dates_from_form($param); - $cond->add_attr("date NUMGE $files_from") if ($files_from); - $cond->add_attr("date NUMLE $files_to") if ($files_to); + $cond->add_attr("backup_date NUMGE $backup_from") if ($backup_from); + $cond->add_attr("backup_date NUMLE $backup_to") if ($backup_to); - $cond->add_attr("shareid NUMEQ $shareid") if ($shareid); - } + $cond->add_attr("date NUMGE $files_from") if ($files_from); + $cond->add_attr("date NUMLE $files_to") if ($files_to); - $offset ||= 0; - $offset = ($offset * $on_page); + $cond->add_attr("shareid NUMEQ $shareid") if ($shareid); # $cond->set_max( $offset + $on_page ); $cond->set_options( $HyperEstraier::Condition::SURE ); @@ -217,13 +220,14 @@ # get the result of search my $result = $db->search($cond, 0); - $result->get(0); my @res; my $hits = $result->size; # for each document in result - for my $i ($offset .. $result->size-1) { + for my $i ($offset .. ($offset + $on_page - 1)) { + last if ($i >= $hits); + my $id = $result->get($i); my $doc = $db->get_doc($id, 0); @@ -237,6 +241,20 @@ return ($hits, \@res); } +sub getGzipName($$$) +{ + my ($host, $share, $backupnum) = @_; + my $ret = $Conf{GzipSchema}; + + $share =~ s/\//_/g; + $ret =~ s/\\h/$host/ge; + $ret =~ s/\\s/$share/ge; + $ret =~ s/\\n/$backupnum/ge; + + return $ret; + +} + sub getBackupsNotBurned() { my $dbh = get_dbh(); @@ -244,6 +262,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, @@ -252,10 +271,8 @@ INNER JOIN shares ON files.shareID=shares.ID 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 - WHERE - files.dvdid IS NULL GROUP BY - backups.hostID, backups.num + backups.hostID, backups.num, backups.shareid ORDER BY min(backups.date) }; my $sth = $dbh->prepare( $sql ); @@ -265,6 +282,10 @@ 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; push @ret, $row; } @@ -274,11 +295,8 @@ sub displayBackupsGrid() { my $retHTML = ""; - my $addForm = 1; - if ($addForm) { - - $retHTML .= < EOF3 - $retHTML .= q{
}; - $retHTML .= q{}; - } - $retHTML .= qq{ - + $retHTML .= q{ + + + +
- }; - - if ($addForm) { - $retHTML .= ""; - } - $retHTML .= qq{ - + + + + + }; - my @backups = getBackupsNotBurned(); - my $backup; + my @color = (' bgcolor="#e0e0e0"', ''); - if ($addForm) { - $retHTML .= qq{ - - }; - } + my $i = 0; + my $host = ''; - foreach $backup(@backups) { + foreach my $backup ( getBackupsNotBurned() ) { + if ($host ne $backup->{'host'}) { + $i++; + $host = $backup->{'host'}; + } my $ftype = ""; - $retHTML .= ""; - if ($addForm) { - $retHTML .= ''; - } - $retHTML .= '' . - '' . - '' . - '' . - '' . - '' . - ''; - } + $retHTML .= + '' . + '' . + '' . + '' . + '' . + '' . + '' . + "\n"; - $retHTML .= "
Host + + Share Backup no Type date age/days size/MBgzip size
+ +
- -
"; + $retHTML .= '' . $backup->{'host'} . '' . $backup->{'backupnum'} . '' . $backup->{'type'} . '' . epoch_to_iso( $backup->{'date'} ) . '' . $backup->{'age'} . '' . $backup->{'size'} . '
' . $backup->{'host'} . ':' . $backup->{'share'} . '' . $backup->{'backupnum'} . '' . $backup->{'type'} . '' . epoch_to_iso( $backup->{'date'} ) . '' . $backup->{'age'} . '' . $backup->{'size'} . '' . $backup->{'fs_size'} .'
"; - if ($addForm) { - $retHTML .= "
"; } + + $retHTML .= ""; + $retHTML .= ""; return $retHTML; } @@ -373,10 +389,10 @@ my $start_t = time(); my ($results, $files); - if ($param->{'use_hest'}) { - ($results, $files) = getFilesHyperEstraier($param, $offset); + if ($param->{'use_hest'} && length($hilite) > 0) { + ($results, $files) = getFilesHyperEstraier($param); } else { - ($results, $files) = getFiles($param, $offset); + ($results, $files) = getFiles($param); } my $dur_t = time() - $start_t; @@ -402,6 +418,7 @@ + @@ -426,17 +443,23 @@ return sprintf(qq{%s}, $action, @_); } + my $i = $offset * $on_page; + foreach $file (@{ $files }) { + $i++; + my $typeStr = BackupPC::Attrib::fileType2Text(undef, $file->{'type'}); $retHTML .= qq{}; + $retHTML .= qq{}; + $retHTML .= qq{} . qq{} . qq{} . qq{} . qq{} . - qq{}; + qq{}; $retHTML .= ""; }
Share Type and Name #
$i} . $file->{'hname'} . ':' . $file->{'sname'} . qq{$typeStr } . hilite_html( $file->{'filepath'}, $hilite ) . qq{} . restore_link( $typeStr, ${EscURI( $file->{'hname'} )}, $file->{'backupnum'}, ${EscURI( $file->{'sname'})}, ${EscURI( $file->{'filepath'} )}, $file->{'backupnum'} ) . qq{} . $file->{'size'} . qq{} . epoch_to_iso( $file->{'date'} ) . qq{} . $file->{'dvd'} . qq{} . '?' . qq{