--- trunk/bin/BackupPC_updatedb	2005/07/13 09:57:41	25
+++ trunk/bin/BackupPC_updatedb	2005/07/31 12:40:51	29
@@ -192,14 +192,6 @@
 		my ($broj) = $sth->{backups_broj}->fetchrow_array();
 		next if ($broj > 0);
 
-		$sth->{insert_backups}->execute(
-			$hostID,
-			$backupNum,
-			$backup->{'endTime'},
-			$backup->{'type'}
-		);
-		$dbh->commit();
-
 		my $files = BackupPC::View->new($bpc, $hostname, \@backups);
 		foreach my $share ($files->shareList($backupNum)) {
 
@@ -210,6 +202,15 @@
 			print " $nf/$f files $nd/$d dirs\n";
 			$dbh->commit();
 		}
+
+		$sth->{insert_backups}->execute(
+			$hostID,
+			$backupNum,
+			$backup->{'endTime'},
+			$backup->{'type'}
+		);
+		$dbh->commit();
+
 	}
 }
 undef $sth;
@@ -271,57 +272,80 @@
 
 	my ($bpc, $hostname, $backups, $backupNum, $share, $dir, $shareID) = @_;
 
+#print STDERR "recurse($hostname,$backupNum,$share,$dir,$shareID)\n";
+
 	my ($nr_files, $new_files, $nr_dirs, $new_dirs) = (0,0,0,0);
 
-	my $files = BackupPC::View->new($bpc, $hostname, $backups);             
-	my $filesInBackup = $files->dirAttrib($backupNum, $share, $dir);
+	{ # scope
+		my @stack;
 
-	# first, add all the entries in current directory
-	foreach my $path_key (keys %{$filesInBackup}) {
-		my @data = (
-			$shareID,
-			$backupNum,
-			$path_key,
-			$filesInBackup->{$path_key}->{'relPath'},
-			$filesInBackup->{$path_key}->{'fullPath'},
-#			$filesInBackup->{$path_key}->{'sharePathM'},
-			$filesInBackup->{$path_key}->{'mtime'},
-			$filesInBackup->{$path_key}->{'type'},
-			$filesInBackup->{$path_key}->{'size'}
-		);
-
-		my $key = join(" ", (
-			$shareID,
-			$dir,
-			$path_key,
-			$filesInBackup->{$path_key}->{'mtime'},
-			$filesInBackup->{$path_key}->{'size'}
-		));
+		my $files = BackupPC::View->new($bpc, $hostname, $backups);             
+		my $filesInBackup = $files->dirAttrib($backupNum, $share, $dir);
 
+		# first, add all the entries in current directory
+		foreach my $path_key (keys %{$filesInBackup}) {
+			my @data = (
+				$shareID,
+				$backupNum,
+				$path_key,
+				$filesInBackup->{$path_key}->{'relPath'},
+				$filesInBackup->{$path_key}->{'fullPath'},
+	#			$filesInBackup->{$path_key}->{'sharePathM'},
+				$filesInBackup->{$path_key}->{'mtime'},
+				$filesInBackup->{$path_key}->{'type'},
+				$filesInBackup->{$path_key}->{'size'}
+			);
+
+			my $key = join(" ", (
+				$shareID,
+				$dir,
+				$path_key,
+				$filesInBackup->{$path_key}->{'mtime'},
+				$filesInBackup->{$path_key}->{'size'}
+			));
+
+
+			if (! $beenThere->{$key} && ! found_in_db(@data)) {
+##print STDERR "# key: $key [", $beenThere->{$key},"]";
+				$sth->{'insert_files'}->execute(@data);
+				if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
+					$new_dirs++;
+##print STDERR " dir\n";
+				} else {
+					$new_files++;
+##print STDERR " file\n";
+				}
+			}
+			$beenThere->{$key}++;
 
-		if (! $beenThere->{$key} && ! found_in_db(@data)) {
-			$sth->{'insert_files'}->execute(@data);
-#			print STDERR "$key\n";
 			if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
-				$new_dirs++;
+				$nr_dirs++;
+
+				my $full_path = $dir . '/' . $path_key;
+				push @stack, $full_path;
+##print STDERR "### store to stack: $full_path\n";
+
+#				my ($f,$nf,$d,$nd) = recurseDir($bpc, $hostname, $backups, $backupNum, $share, $path_key, $shareID) unless ($beenThere->{$key});
+#
+#				$nr_files += $f;
+#				$new_files += $nf;
+#				$nr_dirs += $d;
+#				$new_dirs += $nd;
+
 			} else {
-				$new_files++;
+				$nr_files++;
 			}
 		}
-		$beenThere->{$key}++;
-
-		if ($filesInBackup->{$path_key}->{'type'} == BPC_FTYPE_DIR) {
-			$nr_dirs++;
 
-			my ($f,$nf,$d,$nd) = recurseDir($bpc, $hostname, $backups, $backupNum, $share, $path_key, $shareID);
+##print STDERR "# STACK ",join(", ", @stack),"\n";
 
+		while ( my $dir = shift @stack ) {
+			my ($f,$nf,$d,$nd) = recurseDir($bpc, $hostname, $backups, $backupNum, $share, $dir, $shareID);
+#	print STDERR "## $dir f: $f nf: $nf d: $d nd: $nd\n";
 			$nr_files += $f;
 			$new_files += $nf;
 			$nr_dirs += $d;
 			$new_dirs += $nd;
-
-		} else {
-			$nr_files++;
 		}
 	}