--- trunk/bin/BackupPC_updatedb	2005/08/19 15:38:56	40
+++ trunk/bin/BackupPC_updatedb	2005/08/20 11:39:05	45
@@ -40,14 +40,15 @@
 
 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 @@
 		my @backupShares = ();
 
 		print $hosts->{$host_key}->{'host'},
-			"\t#$backupNum\t",
+			"\t#$backupNum\t", $backup->{type} || '?', " ",
 			$backup->{nFilesNew} || '?', "/", $backup->{nFiles} || '?',
 			" files\n";
 
@@ -293,7 +294,7 @@
 	my @param = ($shareID,$path,$name,$date,$size);
 	$sth->{file_in_db}->execute(@param);
 	my ($rows) = $sth->{file_in_db}->fetchrow_array();
-#	print STDERR ( $rows ? '+' : '-' ), join(" ",@param), "\n";
+	print STDERR "## found_in_db ",( $rows ? '+' : '-' ), join(" ",@param), "\n" if ($debug >= 3);
 	return $rows;
 }
 
@@ -305,13 +306,14 @@
 
 	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);
 
 	{ # scope
 		my @stack;
 
+		print STDERR "# dirAttrib($backupNum, $share, $dir)\n" if ($debug >= 2);
 		my $filesInBackup = $files->dirAttrib($backupNum, $share, $dir);
 
 		# first, add all the entries in current directory