X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=8736e8c0570a1305c91193d167adf9ba857104d5;hb=e125acea7521eb1fcbc825ff45124f9aaa163bfb;hp=cffc324bc02b0d4a0dc93c8c57d856b03cc11243;hpb=3582e507e1dfe99ba850311ea6aa1c8d0ee73f4f;p=debbugs.git

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index cffc324..8736e8c 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -19,8 +19,8 @@ use POSIX qw(strftime nice);
 use Debbugs::Config qw(:globals :text :config);
 use Debbugs::User;
 use Debbugs::CGI qw(version_url maint_decode);
-use Debbugs::Common qw(getparsedaddrs :date make_list getmaintainers);
-use Debbugs::Bugs qw(get_bugs bug_filter);
+use Debbugs::Common qw(getparsedaddrs :date make_list getmaintainers getpseudodesc);
+use Debbugs::Bugs qw(get_bugs bug_filter newest_bug);
 use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions);
 use Debbugs::Status qw(:status);
 use Debbugs::CGI qw(:all);
@@ -41,7 +41,7 @@ our %param = cgi_parameters(query => $q,
 			    single => [qw(ordering archive repeatmerged),
 				       qw(bug-rev pend-rev sev-rev),
 				       qw(maxdays mindays version),
-				       qw(data which dist),
+				       qw(data which dist newest),
 				      ],
 			    default => {ordering => 'normal',
 					archive  => 0,
@@ -85,42 +85,50 @@ unless (defined $ordering) {
    $ordering = "raw" if $raw_sort;
    $ordering = 'age' if $age_sort;
 }
-my ($bug_order) = $ordering =~ /(age(?:rev)?)/;
+our ($bug_order) = $ordering =~ /(age(?:rev)?)/;
 $bug_order = '' if not defined $bug_order;
 
 my $bug_rev = ($param{'bug-rev'} || "no") eq "yes";
 my $pend_rev = ($param{'pend-rev'} || "no") eq "yes";
 my $sev_rev = ($param{'sev-rev'} || "no") eq "yes";
-my $pend_exc = $param{'&pend-exc'} || $param{'pend-exc'} || "";
-my $pend_inc = $param{'&pend-inc'} || $param{'pend-inc'} || "";
-my $sev_exc = $param{'&sev-exc'} || $param{'sev-exc'} || "";
-my $sev_inc = $param{'&sev-inc'} || $param{'sev-inc'} || "";
-my $maxdays = ($param{'maxdays'} || -1);
-my $mindays = ($param{'mindays'} || 0);
-my $version = $param{'version'} || undef;
-my $dist = $param{'dist'} || undef;
-my $arch = $param{'arch'} || undef;
 
-{
-    if (defined $param{'vt'}) {
-        my $vt = $param{'vt'};
-        if ($vt eq "none") { $dist = undef; $arch = undef; $version = undef; }
-        if ($vt eq "bysuite") {
-            $version = undef;
-            $arch = undef if ($arch eq "any");
-        }
-        if ($vt eq "bypkg" || $vt eq "bysrc") { $dist = undef; $arch = undef; }
-    }
-    if (defined $param{'includesubj'}) {
-        my $is = $param{'includesubj'};
-        $include .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $is));
-    }
-    if (defined $param{'excludesubj'}) {
-        my $es = $param{'excludesubj'};
-        $exclude .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $es));
-    }
+my @inc_exc_mapping = ({name   => 'pending',
+			incexc => 'include',
+			key    => 'pend-inc',
+		       },
+		       {name   => 'pending',
+			incexc => 'exclude',
+			key    => 'pend-exc',
+		       },
+		       {name   => 'severity',
+			incexc => 'include',
+			key    => 'sev-inc',
+		       },
+		       {name   => 'severity',
+			incexc => 'exclude',
+			key    => 'sev-exc',
+		       },
+		       {name   => 'subject',
+			incexc => 'include',
+			key    => 'includesubj',
+		       },
+		       {name   => 'subject',
+			incexc => 'exclude',
+			key    => 'excludesubj',
+		       },
+		      );
+for my $incexcmap (@inc_exc_mapping) {
+     push @{$param{$incexcmap->{incexc}}}, map {"$incexcmap->{name}:$_"}
+	  map{split /\s*,\s*/} make_list($param{$incexcmap->{key}})
+	       if exists $param{$incexcmap->{key}};
+     delete $param{$incexcmap->{key}};
 }
 
+my $maxdays = ($param{'maxdays'} || -1);
+my $mindays = ($param{'mindays'} || 0);
+my $version = $param{'version'} || undef;
+# XXX Once the options/selection is rewritten, this should go away
+my $dist = $param{dist} || undef;
 
 our %hidden = map { $_, 1 } qw(status severity classification);
 our %cats = (
@@ -157,7 +165,7 @@ our %cats = (
 );
 
 my @select_key = (qw(submitter maint pkg package src usertag),
-		  qw(status tag maintenc owner severity)
+		  qw(status tag maintenc owner severity newest)
 		 );
 
 if (exists $param{which} and exists $param{data}) {
@@ -193,15 +201,16 @@ for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
 }
 
 if (defined $param{usertag}) {
-    my %select_ut = ();
-    my ($u, $t) = split /:/, $param{usertag}, 2;
-    Debbugs::User::read_usertags(\%select_ut, $u);
-    unless (defined $t && $t ne "") {
-        $t = join(",", keys(%select_ut));
-    }
-
-    add_user($u);
-    push @{$param{tag}}, split /,/, $t;
+     for my $usertag (make_list($param{usertag})) {
+	  my %select_ut = ();
+	  my ($u, $t) = split /:/, $usertag, 2;
+	  Debbugs::User::read_usertags(\%select_ut, $u);
+	  unless (defined $t && $t ne "") {
+	       $t = join(",", keys(%select_ut));
+	  }
+	  add_user($u);
+	  push @{$param{tag}}, split /,/, $t;
+     }
 }
 
 my $Archived = $archive ? " Archived" : "";
@@ -295,24 +304,37 @@ while (my ($key,$value) = splice @search_key_order, 0, 2) {
      for my $entry (make_list($param{$key})) {
 	  my $extra = '';
 	  if (exists $param{dist} and ($key eq 'package' or $key eq 'src')) {
-	       my @versions = get_versions(package => $entry,
+	       my %versions = get_versions(package => $entry,
 					   (exists $param{dist}?(dist => $param{dist}):()),
-					   (exists $param{arch}?(arch => $param{arch}):()),
+					   (exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
 					   ($key eq 'src'?(arch => q(source)):()),
+					   no_source_arch => 1,
+					   return_archs => 1,
 					  );
-	       my $verdesc = join(', ',@versions);
-	       $verdesc = 'version'.(@versions>1?'s ':' ').$verdesc;
-	       $extra= " ($verdesc)" if @versions;
+	       my $verdesc;
+	       if (keys %versions > 1) {
+		    $verdesc = 'versions '. join(', ',
+				    map { $_ .' ['.join(', ',
+						    sort @{$versions{$_}}
+						   ).']';
+				   } keys %versions);
+	       }
+	       else {
+		    $verdesc = 'version '.join(', ',
+					       keys %versions
+					      );
+	       }
+	       $extra= " ($verdesc)" if keys %versions;
 	  }
 	  push @entries, $entry.$extra;
      }
      push @title,$value.' '.join(' or ', @entries);
 }
-my $title = join(' and ', map {/ or /?"($_)":$_} @title);
+my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
 @title = ();
 
 # we have to special case the maint="" search, unfortunatly.
-if (defined $param{maint} and $param{maint} eq "") {
+if (defined $param{maint} and $param{maint} eq "" or ref($param{maint}) and not @{$param{maint}}) {
      my %maintainers = %{getmaintainers()};
      @bugs = get_bugs(function =>
 		      sub {my %d=@_;
@@ -322,20 +344,26 @@ if (defined $param{maint} and $param{maint} eq "") {
 			   return 0;
 		      }
 		     );
-     $title = 'in packages with no maintainer';
+     $title = $gBugs.' in packages with no maintainer';
+}
+elsif (defined $param{newest}) {
+     my $newest_bug = newest_bug();
+     @bugs = ($newest_bug - $param{newest} + 1) .. $newest_bug;
+     $title = @bugs.' newest '.$gBugs;
 }
 else {
      #yeah for magick!
-     @bugs = get_bugs(map {exists $param{$_}?($_,$param{$_}):()}
-		      keys %search_keys, 'archive'
+     @bugs = get_bugs((map {exists $param{$_}?($_,$param{$_}):()}
+		       keys %search_keys, 'archive'),
+		      usertags => \%ut,
 		     );
 }
 
 if (defined $param{version}) {
-     $title .= " at version $version";
+     $title .= " at version $param{version}";
 }
 elsif (defined $param{dist}) {
-     $title .= " in $dist";
+     $title .= " in $param{dist}";
 }
 
 $title = html_escape($title);
@@ -359,7 +387,7 @@ print "<HTML><HEAD>\n" .
     "</HEAD>\n" .
     '<BODY onload="pagemain();">' .
     "\n";
-print "<H1>" . "$gProject$Archived $gBug report logs: $gBugs $title" .
+print "<H1>" . "$gProject$Archived $gBug report logs: $title" .
       "</H1>\n";
 
 my $showresult = 1;
@@ -383,9 +411,17 @@ for my $package (make_list($param{src}||[])) {
 
 sub output_package_info{
     my ($srcorbin,$package) = @_;
+
+    my %pkgsrc = %{getpkgsrc()};
+    my $srcforpkg = $package;
+    if ($srcorbin eq 'binary') {
+	 $srcforpkg = $pkgsrc{$package};
+	 defined $srcforpkg or $srcforpkg = $package;
+    }
+
     my $showpkg = html_escape($package);
     my $maintainers = getmaintainers();
-    my $maint = $maintainers->{$package};
+    my $maint = $maintainers->{$srcforpkg};
     if (defined $maint) {
 	 print '<p>';
 	 print htmlize_maintlinks(sub { $_[0] == 1 ? "Maintainer for $showpkg is "
@@ -396,12 +432,6 @@ sub output_package_info{
     } else {
 	 print "<p>No maintainer for $showpkg. Please do not report new bugs against this package.</p>\n";
     }
-    my %pkgsrc = %{getpkgsrc()};
-    my $srcforpkg = $package;
-    if ($srcorbin eq 'binary') {
-	 $srcforpkg = $pkgsrc{$package};
-	 defined $srcforpkg or $srcforpkg = $package;
-    }
     my @pkgs = getsrcpkgs($srcforpkg);
     @pkgs = grep( !/^\Q$package\E$/, @pkgs );
     if ( @pkgs ) {
@@ -412,7 +442,7 @@ sub output_package_info{
 	      print "<p>You may want to refer to the following individual bug pages:\n";
 	 }
 	 #push @pkgs, $src if ( $src && !grep(/^\Q$src\E$/, @pkgs) );
-	 print join( ", ", map( "<A href=\"" . html_escape(munge_url($this,package=>$_)) . "\">$_</A>", @pkgs ) );
+	 print join( ", ", map( "<A href=\"" . html_escape(munge_url($this,package=>$_,src=>[],newest=>[])) . "\">$_</A>", @pkgs ) );
 	 print ".\n";
     }
     my @references;
@@ -427,11 +457,11 @@ sub output_package_info{
 	 }
 	 if (defined $gSubscriptionDomain) {
 	      my $ptslink = $package ? $srcforpkg : $src;
-	      push @references, "to the <a href=\"http://$gSubscriptionDomain/$ptslink\">Package Tracking System</a>";
+	      push @references, q(to the <a href="http://).html_escape("$gSubscriptionDomain/$ptslink").q(">Package Tracking System</a>);
 	 }
 	 # Only output this if the source listing is non-trivial.
 	 if ($srcorbin eq 'binary' and $srcforpkg) {
-	      push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[])), html_escape($srcforpkg);
+	      push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[],newest=>[])), html_escape($srcforpkg);
 	 }
     }
     if (@references) {
@@ -444,9 +474,8 @@ sub output_package_info{
 	      html_escape("http://${debbugs::gWebDomain}/Reporting${debbugs::gHTMLSuffix}");
     }
     if (not $maint and not @bugs) {
-	 print "<p>There is no record of the " .
-	      ($srcorbin eq 'binary' ? html_escape($package) . " package"
-	       : html_escape($src) . " source package").
+	 print "<p>There is no record of the " . html_escape($package) .
+	      ($srcorbin eq 'binary' ? " package" : " source package") .
 		    ", and no bugs have been filed against it.</p>";
 	 $showresult = 0;
     }
@@ -506,12 +535,12 @@ print "    <td><input id=\"b_1_2\" name=vt value=bysuite type=radio onchange=\"e
 
 if (defined $pkg) {
     my $v = html_escape($version) || "";
-    my $pkgsane = html_escape($pkg);
+    my $pkgsane = html_escape($pkg->[0]);
     print "<tr><td></td>";
     print "    <td><input id=\"b_1_3\" name=vt value=bypkg type=radio onchange=\"enable(1);\" $checked_ver>$pkgsane version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
 } elsif (defined $src) {
     my $v = html_escape($version) || "";
-    my $srcsane = html_escape($src);
+    my $srcsane = html_escape($src->[0]);
     print "<tr><td></td>";
     print "    <td><input name=vt value=bysrc type=radio onchange=\"enable(1);\" $checked_ver>$srcsane version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
 }
@@ -542,7 +571,6 @@ print <<EOF;
 
 <tr><td>&nbsp;</td></tr>
 
-</td></tr>
 <tr><td>Merged bugs should be</td><td>
 <select name=repeatmerged>
 <option value=yes$sel_rmy>displayed separately</option>
@@ -626,16 +654,15 @@ sub pkg_htmlindexentrystatus {
         $showversions .= join ', ', map {s{/}{ }; html_escape($_)} @fixed;
     }
     $result .= ' (<a href="'.
-	 version_url($status{package},
-		     $status{found_versions},
-		     $status{fixed_versions},
+	 version_url(package => $status{package},
+		     found   => $status{found_versions},
+		     fixed   => $status{fixed_versions},
 		    ).qq{">$showversions</a>)} if length $showversions;
     $result .= ";\n";
 
     $result .= $showseverity;
-    $result .= pkg_htmladdresslinks("Reported by: ", \&submitterurl,
-                                $status{originator});
-    $result .= ";\nOwned by: " . html_escape($status{owner})
+    $result .= "Reported by: ".package_links(submitter=>$status{originator});
+    $result .= ";\nOwned by: " . package_links(owner => $status{owner})
                if length $status{owner};
     $result .= ";\nTags: <strong>" 
                  . html_escape(join(", ", sort(split(/\s+/, $status{tags}))))
@@ -668,7 +695,7 @@ sub pkg_htmlindexentrystatus {
             $result .= ";\n<strong>Forwarded</strong> to "
                        . join(', ',
 			      map {maybelink($_)}
-			      split /[,\s]+/,$status{forwarded}
+			      split /\,\s+/,$status{forwarded}
 			     );
         }
 	# Check the age of the logfile
@@ -731,19 +758,42 @@ sub pkg_htmlizebugs {
     );
 
     my %section = ();
+    # Make the include/exclude map
+    my %include;
+    my %exclude;
+    for my $include (make_list($param{include})) {
+	 next unless defined $include;
+	 my ($key,$value) = split /\s*:\s*/,$include,2;
+	 unless (defined $value) {
+	     $key = 'tags';
+	     $value = $include;
+	 }
+	 push @{$include{$key}}, split /\s*,\s*/, $value;
+    }
+    for my $exclude (make_list($param{exclude})) {
+	 next unless defined $exclude;
+	 my ($key,$value) = split /\s*:\s*/,$exclude,2;
+	 unless (defined $value) {
+	     $key = 'tags';
+	     $value = $exclude;
+	 }
+	 push @{$exclude{$key}}, split /\s*,\s*/, $value;
+    }
 
     foreach my $bug (@bugs) {
         my %status = %{get_bug_status(bug=>$bug,
 				      (exists $param{dist}?(dist => $param{dist}):()),
-				      usertags => \%bugusertags,
+				      bugusertags => \%bugusertags,
 				      (exists $param{version}?(version => $param{version}):()),
-				      (exists $param{arch}?(arch => $param{arch}):()),
+				      (exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
 				     )};
         next unless %status;
         next if bug_filter(bug => $bug,
 			   status => \%status,
 			   (exists $param{repeatmerged}?(repeat_merged => $param{repeatmerged}):()),
 			   seen_merged => \%seenmerged,
+			   (keys %include ? (include => \%include):()),
+			   (keys %exclude ? (exclude => \%exclude):()),
 			  );
 
 	my $html = sprintf "<li><a href=\"%s\">#%d: %s</a>\n<br>",
@@ -773,7 +823,7 @@ sub pkg_htmlizebugs {
     if ($ordering eq "raw") {
         $result .= "<UL class=\"bugs\">\n" . join("", map( { $_->[ 2 ] } @status ) ) . "</UL>\n";
     } else {
-        $header .= "<ul>\n<div class=\"msgreceived\">\n";
+        $header .= "<div class=\"msgreceived\">\n<ul>\n";
 	my @keys_in_order = ("");
 	for my $o (@order) {
 	    push @keys_in_order, "X";
@@ -814,7 +864,7 @@ sub pkg_htmlizebugs {
         } 
         $header .= "</ul></div>\n";
 
-        $footer .= "<ul>\n<div class=\"msgreceived\">";
+        $footer .= "<div class=\"msgreceived\">\n<ul>\n";
         for my $i (0..$#prior) {
             my $local_result = '';
             foreach my $key ( @{$order[$i]} ) {
@@ -826,7 +876,7 @@ sub pkg_htmlizebugs {
                 $footer .= "<li>$names[$i]<ul>\n$local_result</ul></li>\n";
             }
         }
-        $footer .= "</div></ul>\n";
+        $footer .= "</ul>\n</div>\n";
     }
 
     $result = $header . $result if ( $common{show_list_header} );
@@ -847,16 +897,12 @@ sub pkg_htmlpackagelinks {
     return 'Package' . (@pkglist > 1 ? 's' : '') . ': ' .
            join(', ',
                 map {
-                    '<a class="submitter" href="' . munge_url($this,src=>[],package=>$_) . '">' .
+                    '<a class="submitter" href="' . munge_url($this,src=>[],package=>$_,newest=>[]) . '">' .
                     $openstrong . html_escape($_) . $closestrong . '</a>'
                 } @pkglist
            );
 }
 
-sub pkg_htmladdresslinks {
-     htmlize_addresslinks(@_,'submitter');
-}
-
 sub pkg_javascript {
     return <<EOF ;
 <script type="text/javascript">
@@ -979,7 +1025,7 @@ sub pkg_htmlselectarch {
 sub myurl {
      return html_escape(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
 			     qw(archive repeatmerged mindays maxdays),
-			     qw(version dist arch pkg src tag maint submitter)
+			     qw(version dist arch package src tag maint submitter)
 			    )
 		    );
 }
@@ -1056,7 +1102,7 @@ sub determine_ordering {
         while (defined $param{"pri$i"}) {
             my $h = {};
 
-            my $pri = $param{"pri$i"};
+            my ($pri) = make_list($param{"pri$i"});
             if ($pri =~ m/^([^:]*):(.*)$/) {
               $h->{"nam"} = $1;  # overridden later if necesary
               $h->{"pri"} = [ map { "$1=$_" } (split /,/, $2) ];
@@ -1064,12 +1110,12 @@ sub determine_ordering {
               $h->{"pri"} = [ split /,/, $pri ];
             }
 
-	    $h->{"nam"} = $param{"nam$i"}
-                if (defined $param{"nam$i"}); 
-            $h->{"ord"} = [ split /\s*,\s*/, $param{"ord$i"} ]
-                if (defined $param{"ord$i"}); 
-            $h->{"ttl"} = [ split /\s*,\s*/, $param{"ttl$i"} ]
-                if (defined $param{"ttl$i"}); 
+	    ($h->{"nam"}) = make_list($param{"nam$i"})
+                if (defined $param{"nam$i"});
+            $h->{"ord"} = [ map {split /\s*,\s*/} make_list($param{"ord$i"}) ]
+                if (defined $param{"ord$i"});
+	    $h->{"ttl"} = [ map {split /\s*,\s*/} make_list($param{"ttl$i"}) ]
+                if (defined $param{"ttl$i"});
 
             push @c, $h;
 	    $i++;