added verbosity level to -v and backup type to display

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@44 8392b6e1-25fa-0310-8288-cc32f8e212ea

diff --git a/bin/BackupPC_updatedb b/bin/BackupPC_updatedb
index 2cea60f..8e63be5 100755 (executable)
--- a/bin/BackupPC_updatedb
+++ b/bin/BackupPC_updatedb
@@ -40,14 +40,15 @@ my $dbh = DBI->connect($dsn, "", "", { RaiseError => 1, AutoCommit => 0 });
 
 my %opt;
 
-if ( !getopts("cdm:v", \%opt ) ) {
+if ( !getopts("cdm:v:", \%opt ) ) {
        print STDERR <<EOF;
-usage: $0 [-c|-d] [-m num]
+usage: $0 [-c|-d] [-m num] [-v|-v level]
 
 Options:
        -c      create database on first use
        -d      delete database before import
        -m num  import just num increments for one host
+       -v num  set verbosity (debug) level (default $debug)
 EOF
        exit 1;
 }
@@ -210,7 +211,7 @@ foreach my $host_key (keys %{$hosts}) {
                my @backupShares = ();
 
                print $hosts->{$host_key}->{'host'},
-                       "\t#$backupNum\t",
+                       "\t#$backupNum\t", $backup->{type} || '?', " ",
                        $backup->{nFilesNew} || '?', "/", $backup->{nFiles} || '?',
                        " files\n";
 
@@ -305,7 +306,7 @@ sub recurseDir($$$$$$$$) {
 
        my ($bpc, $hostname, $files, $backupNum, $share, $dir, $shareID) = @_;
 
-       print STDERR "recurse($hostname,$backupNum,$share,$dir,$shareID)\n" if ($debug >= 1);
+       print STDERR "\nrecurse($hostname,$backupNum,$share,$dir,$shareID)\n" if ($debug >= 1);
 
        my ($nr_files, $new_files, $nr_dirs, $new_dirs) = (0,0,0,0);