X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=cgi%2Fpkgreport.cgi;h=0bde19058362e71ec8dcb869165010e83ba9995e;hb=5e2ac75c230d4182e4857191177e7e0b20692ffa;hp=d29c3abc7ff56943a7a0a2196be16e5560bda857;hpb=4ac94f292bfbf36863795ed9d695be7ad2b5b344;p=debbugs.git diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index d29c3ab..0bde190 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -18,10 +18,32 @@ BEGIN{ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; } -# STDOUT should be in utf8 mode -binmode(STDOUT,':utf8'); +# if we're running out of git, we want to use the git base directory as the +# first INC directory. If you're not running out of git, don't do that. +use File::Basename qw(dirname); +use Cwd qw(abs_path); +our $debbugs_dir; +BEGIN { + $debbugs_dir = + abs_path(dirname(abs_path(__FILE__)) . '/../'); + # clear the taint; we'll assume that the absolute path to __FILE__ is the + # right path if there's a .git directory there + ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/; + if (defined $debbugs_dir and + -d $debbugs_dir . '/.git/') { + } else { + undef $debbugs_dir; + } + # if the first directory in @INC is not an absolute directory, assume that + # someone has overridden us via -I. + if ($INC[0] !~ /^\//) { + } +} +use if defined $debbugs_dir, lib => $debbugs_dir; +binmode(STDOUT,':encoding(UTF-8)'); use POSIX qw(strftime nice); +use List::AllUtils qw(uniq); use Debbugs::Config qw(:globals :text :config); @@ -30,7 +52,7 @@ use Debbugs::User; use Debbugs::Common qw(getparsedaddrs make_list getmaintainers getpseudodesc); use Debbugs::Bugs qw(get_bugs bug_filter newest_bug); -use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions); +use Debbugs::Packages qw(source_to_binary binary_to_source get_versions); use Debbugs::Status qw(splitpackages); @@ -40,6 +62,16 @@ use Debbugs::CGI::Pkgreport qw(:all); use Debbugs::Text qw(:templates); +use Debbugs::DB; + +my $s; +my @schema_arg = (); +if (defined $config{database}) { + $s = Debbugs::DB->connect($config{database}) or + die "Unable to connect to DB"; + @schema_arg = ('schema',$s); +} + use CGI::Simple; my $q = new CGI::Simple; @@ -230,7 +262,8 @@ our %cats = ( "ord" => [2,3,4,1,0,5], } ], "oldview" => [ qw(status severity) ], - "normal" => [ qw(status severity classification) ], + "normal" => [ qw(status severity classification) ], + raw => [{nam => 'Raw',def => 'Raw'}], ); if (exists $param{which} and exists $param{data}) { @@ -277,7 +310,8 @@ if (defined $param{usertag}) { } } -quitcgi("You have to choose something to select by") unless grep {exists $param{$_}} keys %package_search_keys; +quitcgi("You have to choose something to select by", '400 Bad Request') + unless grep {exists $param{$_}} keys %package_search_keys; my $Archived = $param{archive} ? " Archived" : ""; @@ -292,28 +326,39 @@ my %strings = (); my @bugs; # addusers for source and binary packages being searched for -my $pkgsrc = getpkgsrc(); -my $srcpkg = getsrcpkgs(); -for my $package (# For binary packages, add the binary package - # and corresponding source package - make_list($param{package}||[]), - (map {defined $pkgsrc->{$_}?($pkgsrc->{$_}):()} - make_list($param{package}||[]), - ), - # For source packages, add the source package - # and corresponding binary packages - make_list($param{src}||[]), - (map {defined $srcpkg->{$_}?($srcpkg->{$_}):()} - make_list($param{src}||[]), - ), - ) { - next unless defined $package; - add_user($package.'@'.$config{usertag_package_domain}, - \%ut,\%bugusertags,\%seen_users,\%cats,\%hidden) - if defined $config{usertag_package_domain}; +if (defined $config{usertag_package_domain}) { + my @possible_packages; + if (exists $param{packages} and + defined $param{packages} + ) { + # For binary packages, add the binary package and corresponding source package + push @possible_packages, + make_list($param{package}); + push @possible_packages, + binary_to_source(source_only => 1, + binary=>$param{package}, + @schema_arg, + ); + } + if (exists $param{src} and + defined $param{src} + ) { + # For source packages, add the source package and corresponding binary packages + push @possible_packages, + make_list($param{src}); + push @possible_packages, + source_to_binary(binary_only => 1, + source => $param{src}, + @schema_arg, + ); + } + for my $package (@possible_packages) { + next unless defined $package and length $package; + add_user($package.'@'.$config{usertag_package_domain}, + \%ut,\%bugusertags,\%seen_users,\%cats,\%hidden); + } } - # walk through the keys and make the right get_bugs query. my $form_option_variables = {}; @@ -378,6 +423,7 @@ my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title); grep {$_ ne 'newest'} keys %package_search_keys, 'archive'), usertags => \%ut, + @schema_arg, ); # shove in bugs which affect this package if there is a package or a @@ -391,6 +437,7 @@ if (not exists $param{affects} and not exists $param{noaffects} and grep {$_ ne 'newest'} keys %package_search_keys, 'archive'), usertags => \%ut, + @schema_arg, ); } @@ -435,9 +482,11 @@ my $result = pkg_htmlizebugs(bugs => \@bugs, exclude => $exclude, this => $this, options => \%param, + @schema_arg, (exists $param{dist})?(dist => $param{dist}):(), ); +print "Cache-Control: public, max-age=300\n"; print "Content-Type: text/html; charset=utf-8\n\n"; print "\n"; @@ -468,6 +517,7 @@ for my $package (make_list($param{package}||[])) { package => $package, options => \%param, bugs => \@bugs, + @schema_arg, ); } for my $package (make_list($param{src}||[])) { @@ -475,6 +525,7 @@ for my $package (make_list($param{src}||[])) { package => $package, options => \%param, bugs => \@bugs, + @schema_arg, ); } @@ -495,6 +546,9 @@ print fill_in_template(template=>'cgi/pkgreport_javascript'); print qq(

Options

\n); +$param{orderings} = + [uniq((grep {!$hidden{$_}} keys %cats), + $param{ordering})]; print option_form(template => 'cgi/pkgreport_options', param => \%param, form_options => $form_options,