X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FBackupPC%2FSearch.pm;h=3783c554f6af8c0ed2875eeb97138def66ddd6be;hb=refs%2Fheads%2Fhospira;hp=7f75add02724ef493c4ae670a30fd816ac255ece;hpb=ef9301b407599b033433abaa9d43ad6294bb663b;p=BackupPC.git diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm index 7f75add..3783c55 100644 --- a/lib/BackupPC/Search.pm +++ b/lib/BackupPC/Search.pm @@ -45,7 +45,7 @@ sub get_dbh { return $dbh; } -sub getUnits() { +sub getShares { my @ret; my $dbh = get_dbh(); @@ -61,6 +61,9 @@ sub getUnits() { push @ret, { 'id' => '', 'share' => '-'}; # dummy any while ( my $row = $sth->fetchrow_hashref() ) { + if ( my $hide = $Conf{SearchHideShare} ) { + next if $row->{share} =~ m/$hide/; + } push @ret, $row; } return @ret; @@ -101,6 +104,12 @@ sub dates_from_form($) { $dt -= DateTime::Duration->new( days => 1 ); } + if ( $suffix eq 'to' ) { + # to end of day + $dt += DateTime::Duration->new( days => 1 ); + $dt -= DateTime::Duration->new( seconds => 1 ); + } + print STDERR "mk_epoch_date($name,$suffix) [$yyyy-$mm-$dd] = " . $dt->ymd . " " . $dt->hms . "\n"; return $dt->epoch || 'NULL'; } @@ -379,7 +388,7 @@ warn "# row ",dump $row; $all_backup_numbers->{ $row->{num} } = $row->{inc_deleted} ? 0 : $row->{size} == 0 ? 0 : - $row->{inc_size} > 0 ? 0 : + $row->{inc_size}!= 0 ? 0 : $row->{size} > 0 ? 1 : 0; }