Skip to content
Snippets Groups Projects
Commit 79637e99 authored by Jens Steidl's avatar Jens Steidl :baby_chick:
Browse files

- minor report rework (skipping details more clear)

parent 2d53b3ab
No related branches found
No related tags found
No related merge requests found
...@@ -370,7 +370,7 @@ sub stage2_for_ie { ...@@ -370,7 +370,7 @@ sub stage2_for_ie {
} }
} }
if ($ie_errors == 0) { if ($ie_errors == 0) {
$report_path->append_utf8(" none\n"); $report_path->append_utf8(" no fixity errors\n");
} }
# write report # write report
...@@ -403,7 +403,6 @@ sub stage2 ($$$$) { ...@@ -403,7 +403,6 @@ sub stage2 ($$$$) {
$stat->{errors} = 0; $stat->{errors} = 0;
$stat->{scansize} = 0; $stat->{scansize} = 0;
$stat->{begin} = time; $stat->{begin} = time;
my $prev_ie = "";
$fh_unsorted_file = $tmp_ies_unsorted_path->openr(); $fh_unsorted_file = $tmp_ies_unsorted_path->openr();
while (<$fh_unsorted_file>) { while (<$fh_unsorted_file>) {
chomp; chomp;
...@@ -414,7 +413,7 @@ sub stage2 ($$$$) { ...@@ -414,7 +413,7 @@ sub stage2 ($$$$) {
my $bfusage = int($bf->key_count() * 100 / $capacity); my $bfusage = int($bf->key_count() * 100 / $capacity);
print $progressbar->report("parse IE files: %40b running: %L ETA: %E ($count/$cnt_unsorted_files IEs, tfr=$transferrate_in_MBs MB/s, bfu=$bfusage%) \r", ++$count); print $progressbar->report("parse IE files: %40b running: %L ETA: %E ($count/$cnt_unsorted_files IEs, tfr=$transferrate_in_MBs MB/s, bfu=$bfusage%) \r", ++$count);
my $timestamp = strftime("%Y-%m-%d %H:%M:%S %z (%Z)", localtime(time)); my $timestamp = strftime("%Y-%m-%d %H:%M:%S %z (%Z)", localtime(time));
$report_path->append_utf8("$timestamp, IE $actual_ie with following errors:\n"); $report_path->append_utf8("$timestamp, IE $actual_ie:\n");
if (! -f $actual_ie ) { if (! -f $actual_ie ) {
$report_path->append_utf8("IE file does not exist (anymore)!"); $report_path->append_utf8("IE file does not exist (anymore)!");
$stat->{errors}++; $stat->{errors}++;
...@@ -433,8 +432,14 @@ sub stage2 ($$$$) { ...@@ -433,8 +432,14 @@ sub stage2 ($$$$) {
} }
my $ret = parse_iexml($actual_ie, $recovery); my $ret = parse_iexml($actual_ie, $recovery);
my $unseen = bloomfilter_to_unseen($bf, $ret->{files}); my $unseen = bloomfilter_to_unseen($bf, $ret->{files});
if (scalar @{$unseen} == 0) {$report_path->append_utf8("skipped because files already checked using IE $prev_ie\n");} my ($fcount_all, $fcount_unseen) = (scalar @{$ret->{files}}, scalar @{$unseen});
$prev_ie = $actual_ie; if ($fcount_unseen == 0) {
$report_path->append_utf8(" all files skipped because already checked\n");
}
elsif ($fcount_all > $fcount_unseen) {
my $fdiff = $fcount_all - $fcount_unseen;
$report_path->append_utf8(" $fdiff of $fcount_all files skipped because already checked\n");
}
### ###
$bf = stage2_for_ie($unseen, $bf, $map_path, $report_path, $stat); $bf = stage2_for_ie($unseen, $bf, $map_path, $report_path, $stat);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment