Minor adjustments to UH parser
authorDario Sestito <darios@symbian.org>
Wed, 24 Mar 2010 17:17:32 +0000
changeset 204 604012c39141
parent 203 7d674ef4b3c2
child 205 a72028551617
Minor adjustments to UH parser
uh_parser/releaseables.pm
uh_parser/uh.pl
--- a/uh_parser/releaseables.pm	Wed Mar 24 17:04:41 2010 +0000
+++ b/uh_parser/releaseables.pm	Wed Mar 24 17:17:32 2010 +0000
@@ -236,7 +236,6 @@
 			
 			print "Writing info file $filename\n" if (!-f$filename);
 			open(FILE, ">>$filename");
-			open(MISSING, ">>$filenamemissing");
 			
 			for my $filetype (keys %{$whatlog_info->{$bldinf}->{$config}})
 			{
@@ -247,13 +246,13 @@
 					
 					if($::missing && !-f $file)
 					{
-					   print MISSING $file."\n";
-                    }
+            open(MISSING, ">>$filenamemissing");
+            print MISSING $file."\n";
+            close(MISSING);
+          }
 				}
 			}
-			close(FILE);						
-			close(MISSING) if ($::missing);
-			
+			close(FILE);
 		}
 	}
 }
--- a/uh_parser/uh.pl	Wed Mar 24 17:04:41 2010 +0000
+++ b/uh_parser/uh.pl	Wed Mar 24 17:17:32 2010 +0000
@@ -268,14 +268,15 @@
 			$packageline .= "<td>$failuresbyseverity</td>";
 		}
 		$packageline .= "<td>".$missing_by_package->{$package}."</td>" if ($missing);
-		$packageline .= "</tr>";
+		$packageline .= "</tr>\n";
 		print AGGREGATED "$packageline\n";
 	}
 	else
 	{
 		my $packageline = "<tr><td>$package</td>";
 		for (@severities) { $packageline .= "<td>0</td>"; }
-		$packageline .= "</tr>";
+		$packageline .= "<td>0</td>" if ($missing);
+		$packageline .= "</tr>\n";
 		print AGGREGATED "$packageline\n";
 	}
 }
@@ -426,7 +427,7 @@
 	opendir(DIR, $raptorbitsdir);
 	my @failurefiles = readdir(DIR);
 	closedir(DIR);	
-	@failurefiles = grep(/\.txt$/, @failurefiles);
+	@failurefiles = grep($_ =~ /\.txt$/ && $_ !~ /_missing\.txt$/, @failurefiles);
 	
 	for my $file (@failurefiles)
 	{