added SearchHideShare regex to config

[BackupPC.git] / lib / BackupPC / Search.pm

diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index a6f01ff..1c3007f 100644 (file)
--- 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;
@@ -371,13 +374,15 @@ sub host_backup_nums {
        # and inc_size < 0 and size > 0 and not inc_deleted
 
        my $all_backup_numbers;
+       # pre-seed with on disk backups
+       $all_backup_numbers->{ $_->{num} }++ foreach $bpc->BackupInfoRead($host);
 
        while( my $row = $sth->fetchrow_hashref ) {
 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;
        }