Add parsed logs and built configs at the top of the main page
authorDario Sestito <darios@symbian.org>
Mon, 10 May 2010 14:23:00 +0100
changeset 232 fde18ad07a01
parent 231 b59a964f37ef
child 233 71dcc4963b58
Add parsed logs and built configs at the top of the main page
uh_parser/RaptorError.pm
uh_parser/RaptorInfo.pm
uh_parser/uh.pl
--- 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} &&
--- 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;	
 	}
 }
 
--- 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<br/>\n";
+print AGGREGATED "RAPTOR BUILD SUMMARY<br/><br/>\n";
+
+my $allfilesstring = '';
+for my $raptorfile (sort {$a cmp $b} @logfiles) { $allfilesstring .= ", $raptorfile"; }
+$allfilesstring =~ s/^, //;
+print AGGREGATED "PARSED LOGS: $allfilesstring<br/>\n";
+
+my $allconfigsstring = '';
+for my $raptorconfig (sort {$a cmp $b} keys %{$allconfigs}) { $allconfigsstring .= ", $raptorconfig"; }
+$allconfigsstring =~ s/^, //;
+print AGGREGATED "BUILT CONFIGS: $allconfigsstring<br/><br/>\n";
 
 print AGGREGATED "<br/>GENERAL FAILURES<br/>\n";
 print AGGREGATED "<table border='1'>\n";