# HG changeset patch # User Dario Sestito # Date 1273497780 -3600 # Node ID fde18ad07a01823c288a76956abbaaa33aa38d1a # Parent b59a964f37effd549c15a1507d20ee5187f123b9 Add parsed logs and built configs at the top of the main page diff -r b59a964f37ef -r fde18ad07a01 uh_parser/RaptorError.pm --- a/uh_parser/RaptorError.pm Mon May 10 12:03:05 2010 +0100 +++ b/uh_parser/RaptorError.pm Mon May 10 14:23:00 2010 +0100 @@ -187,6 +187,8 @@ $characters =~ s,^[\r\n]*,,; $characters =~ s,[\r\n]*$,,; + #print "error: -->$characters<--\n"; + my $package = ''; # if bldinf attribute is not available then heuristically attempt to determine the package if (!$raptor_error_info->{bldinf} && diff -r b59a964f37ef -r fde18ad07a01 uh_parser/RaptorInfo.pm --- a/uh_parser/RaptorInfo.pm Mon May 10 12:03:05 2010 +0100 +++ b/uh_parser/RaptorInfo.pm Mon May 10 14:23:00 2010 +0100 @@ -42,14 +42,9 @@ { my ($text) = @_; - my $severity = ''; - - if ($text =~ m,unmatchable,) + if ($text =~ m,Buildable configuration '(.*)',) { - $severity = $RaptorCommon::SEVERITY_CRITICAL; - - #dump_error($category, $severity, $text); - print "$category, $severity, $text\n"; + $::allconfigs->{$1}=1; } } diff -r b59a964f37ef -r fde18ad07a01 uh_parser/uh.pl --- a/uh_parser/uh.pl Mon May 10 12:03:05 2010 +0100 +++ b/uh_parser/uh.pl Mon May 10 14:23:00 2010 +0100 @@ -105,6 +105,7 @@ $saxhandler->add_observer('releaseables', $releaseables::reset_status); our $allbldinfs = {}; +our $allconfigs = {}; my $parser = XML::SAX::ParserFactory->parser(Handler=>$saxhandler); for (@logfiles) @@ -240,7 +241,17 @@ # PRINT HTML SUMMARY my $aggregated_html = "$outputdir/index.html"; open(AGGREGATED, ">$aggregated_html"); -print AGGREGATED "RAPTOR BUILD SUMMARY
\n"; +print AGGREGATED "RAPTOR BUILD SUMMARY

\n"; + +my $allfilesstring = ''; +for my $raptorfile (sort {$a cmp $b} @logfiles) { $allfilesstring .= ", $raptorfile"; } +$allfilesstring =~ s/^, //; +print AGGREGATED "PARSED LOGS: $allfilesstring
\n"; + +my $allconfigsstring = ''; +for my $raptorconfig (sort {$a cmp $b} keys %{$allconfigs}) { $allconfigsstring .= ", $raptorconfig"; } +$allconfigsstring =~ s/^, //; +print AGGREGATED "BUILT CONFIGS: $allconfigsstring

\n"; print AGGREGATED "
GENERAL FAILURES
\n"; print AGGREGATED "\n";