X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_ASA_SearchUpdate;h=279b8b0b1fb17cec684928d12a495a9836227bc3;hp=2ce01fced16421a8993f61da2101d6868769f47c;hb=d1bfa4d92bec24954f2e7877f6531644bb84e8f3;hpb=6f1417a87b4dbf737df8d0f56f41dcc806a79d0d

diff --git a/bin/BackupPC_ASA_SearchUpdate b/bin/BackupPC_ASA_SearchUpdate
index 2ce01fc..279b8b0 100755
--- a/bin/BackupPC_ASA_SearchUpdate
+++ b/bin/BackupPC_ASA_SearchUpdate
@@ -78,6 +78,19 @@ warn "hosts: ",dump( $opt->host );
 
 #---- subs ----
 
+sub status {
+	my $text = shift;
+	$text =~ s{\s+$}{};
+	my $new = $0;
+	$new =~ s{^[\w\/]+/(\w+) }{$1 }; # strip path from process name
+	if ( $text =~ m/^\|/ ) {
+		$new =~ s/\|.*/$text/ or $new .= " $text";
+	} else {
+		$new =~ s/\s+.*/ $text/ or $new .= " $text";
+	}
+	$0 = $new;
+}
+
 sub fmt_time {
 	my $t = shift || return;
 	my $out = "";
@@ -170,6 +183,7 @@ sub hest_update {
 		}
 
 		print "$added";
+		status "| $added";
 
 		$offset += EST_CHUNK;
 
@@ -343,8 +357,6 @@ if ($opt->create) {
 		$dbh->do( qq{ CREATE SEQUENCE $seq } );
 	}
 
-=for later
-
 	print " creating triggers ";
 	$dbh->do( <<__END_OF_TRIGGER__ );
 
@@ -406,8 +418,6 @@ create trigger do_backup_backup_parts_check
 
 __END_OF_TRIGGER__
 
-=cut
-
 	print "...\n";
 
 	$dbh->commit;
@@ -440,7 +450,7 @@ INSERT INTO hosts (name, IP) VALUES (?,?)
 });
 
 $sth->{hosts_by_name} = $dbh->prepare(qq{
-SELECT ID FROM hosts WHERE name=?
+SELECT id FROM hosts WHERE name=?
 });
 
 $sth->{backups_count} = $dbh->prepare(qq{
@@ -518,8 +528,9 @@ foreach my $host_key (@hosts) {
 			fmt_time($backup->{endTime} - $backup->{startTime})
 		);
 		print $share_header unless $opt->quiet;
+		status "$hostname $backupNum $share_header";
 
-		my $files = BackupPC::View->new($bpc, $hostname, \@backups, { only_first => 1 });
+		my $files = BackupPC::View->new($bpc, $hostname, \@backups, { only_increment => 1 });
 
 		foreach my $share ($files->shareList($backupNum)) {
 
@@ -572,16 +583,21 @@ foreach my $host_key (@hosts) {
 			}
 
 			my $dur = (time() - $t) || 1;
-			printf(" %d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]\n",
+			my $status = sprintf("%d/%d files %d/%d dirs %0.2f MB [%.2f/s dur: %s]",
 				$nf, $f, $nd, $d,
 				($size / 1024 / 1024),
 				( ($f+$d) / $dur ),
 				fmt_time($dur)
 			);
+			print " $status\n";
+			status "$hostname $backupNum $status";
 
 			if ($nf + $nd > 0) {
-				eval { hest_update($hostID, $shareID, $backupNum) };
-				warn "ERROR: $@" if $@;
+				status "$hostname $backupNum full-text | indexing";
+				#eval { hest_update($hostID, $shareID, $backupNum) };
+				#warn "ERROR: $@" if $@;
+				hest_update($hostID, $shareID, $backupNum);
+				# eval breaks our re-try logic
 			}
 		}