--- trunk/bin/BackupPC_incPartsUpdate	2005/10/11 16:00:02	172
+++ trunk/bin/BackupPC_incPartsUpdate	2005/10/13 17:11:59	194
@@ -63,12 +63,13 @@
 	backups.id as backup_id,
 	hosts.name as host,
 	shares.name as share,
-	backups.num as num
+	backups.num as num,
+	inc_size
 from backups
 	join shares on backups.hostid = shares.hostid
 		and shares.id = backups.shareid
 	join hosts on shares.hostid = hosts.id
-where inc_size < 0 and not inc_deleted
+where not inc_deleted
 order by backups.date
 
 } );
@@ -82,28 +83,49 @@
 
 while (my $row = $sth->fetchrow_hashref) {
 	my $tar_file = BackupPC::SearchLib::getGzipName($row->{'host'}, $row->{'share'}, $row->{'num'});
-	print curr_time, sprintf(" %s:%s %-3d ", $row->{'host'}, $row->{'share'}, $row->{'num'}), " -> $tar_file ";
+
+	# this will return -1 if file doesn't exist
+	my $size = BackupPC::SearchLib::get_tgz_size_by_name($tar_file);
+
+	print curr_time, " ", $row->{'host'}, ":", $row->{'share'}, " #", $row->{'num'}, " -> $tar_file";
 
 	my $t = time();
 
-	my $cmd = qq{$tarIncCreate -h "$row->{'host'}" -s "$row->{'share'}" -n $row->{'num'} | gzip -9 > $tar_dir/$tar_file};
-	print STDERR "## $cmd\n" if ($debug);
+	# re-create archive?
+	if ($row->{'inc_size'} == -1 || $size == -1 || $row->{'inc_size'} != $size) {
+		my $cmd = qq{$tarIncCreate -h "$row->{'host'}" -s "$row->{'share'}" -n $row->{'num'} | gzip -9 > $tar_dir/$tar_file};
+		print STDERR "## $cmd\n" if ($debug);
+
+		system($cmd) == 0 or die "failed: $?";
+	
+		$size = (stat( "$tar_dir/$tar_file" ))[7];
+	}
 
-	system($cmd) == 0 or die "failed: $?";
+	if ($size > 45) {
 
-	my $size = (stat( "$tar_dir/$tar_file" ))[7];
+		my $max_size = $Conf{'MaxArchiveSize'} || die "problem with MaxArchieSize parametar";
 
-	print " dur: ",fmt_time(time() - $t)," $size bytes";
+		if ($size > $max_size && ! -d "$tar_dir/$tar_file") {
+			print " split";
+			my $in = my $out = "$tar_dir/$tar_file";
+			$out .= '.tmp';
+			rename $in, $out || die "can't rename $in: $!";
+			mkdir $in || die "can't mkdir $in: $!";
+			system("split -d -b $max_size $out $in/part") == 0 or die "can't split $out: $!";
+			unlink $out || die "can't unlink $out: $!";
+		}
 
-	if ($size > 45) {
 		$sth_inc_size->execute($size, $row->{'backup_id'});
 		$sth_inc_deleted->execute(0, $row->{'backup_id'});
+
+		printf(" %1.2f MB", ($size / 1024 / 1024));
+
 	} else {
 		$sth_inc_deleted->execute(1, $row->{'backup_id'});
 		unlink "$tar_dir/$tar_file" || die "can't delete $tar_dir/$tar_file: $!\n";
 		print " EMPTY";
 	}
-	print "\n";
+	print ", dur: ",fmt_time(time() - $t), "\n";
 
 	$dbh->commit;