* The global in cgi/version.cgi should be our, not my

[debbugs.git] / cgi / version.cgi

diff --git a/cgi/version.cgi b/cgi/version.cgi
index 0fc1dafc6961569f02683bc3add90c866c612734..8d575ffbe948639e5679b60263b8debbfba52b05 100755 (executable)
--- a/cgi/version.cgi
+++ b/cgi/version.cgi
@@ -39,7 +39,7 @@ my %cgi_var = cgi_parameters(query   => $q,
                                         found         => [],
                                         fixed         => [],
                                         ignore_boring => 1,
-                                        collapse      => 1,
+                                        collapse      => 0,
                                         format        => 'png',
                                         width         => undef,
                                         height        => undef,
@@ -144,7 +144,10 @@ if ($cgi_var{collapse}) {
                                               or $all_states{$key} eq 'absent');
          next if $cgi_var{ignore_boring} and not version_relevant($version,$key,\@interesting_versions);
          if (defined $version->{parent}{$key}) {
-              push @{$reversed_nodes{$version->{parent}{$key}}}, $key;
+              next if $cgi_var{ignore_boring} and (not defined $all_states{$version->{parent}{$key}}
+                                                   or $all_states{$version->{parent}{$key}} eq 'absent');
+              next if $cgi_var{ignore_boring} and not version_relevant($version,$version->{parent}{$key},\@interesting_versions);
+              push @{$reversed_nodes{$version->{parent}{$key}}},$key;
          }
          else {
               $reversed_nodes{$key} ||=[];
@@ -233,6 +236,7 @@ if ($cgi_var{collapse}) {
      my %used_node;
      foreach my $group (values %group_nodes) {
          next if $used_node{$group->{name}};
+         next if not defined $group->{parent};
          $used_node{$group->{name}} = 1;
          $dot .= qq("$group->{name}").'->'.q(").
               (exists $collapsed_nodes{$group->{parent}}?
@@ -263,7 +267,7 @@ else {
 }
 
 
-my %_version_relevant_cache;
+our %_version_relevant_cache;
 sub version_relevant {
      my ($version,$test_version,$relevant_versions) = @_;
      for my $dist_version (@{$relevant_versions}) {