X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=d27caa13dc39c58dd5dc0a7216d1086fd39c32a1;hb=9e1812518c39ffaaa9000f08a4966323c58937ef;hp=455df20cea2896c7f2645c601d59a14584ce50a4;hpb=235a779bdb026b6357e95053e1d7faaab87e8931;p=debbugs.git

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 455df20..d27caa1 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -20,6 +20,7 @@ BEGIN{
 
 binmode(STDOUT,':encoding(UTF-8)');
 use POSIX qw(strftime nice);
+use List::AllUtils qw(uniq);
 
 use Debbugs::Config qw(:globals :text :config);
 
@@ -38,6 +39,14 @@ use Debbugs::CGI::Pkgreport qw(:all);
 
 use Debbugs::Text qw(:templates);
 
+use Debbugs::DB;
+
+my $s;
+if (defined $config{database}) {
+    $s = Debbugs::DB->connect($config{database}) or
+        die "Unable to connect to DB";
+}
+
 use CGI::Simple;
 my $q = new CGI::Simple;
 
@@ -228,7 +237,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}) {
@@ -377,6 +387,7 @@ my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
 		  grep {$_ ne 'newest'}
 		  keys %package_search_keys, 'archive'),
 		 usertags => \%ut,
+		 defined $s?(schema => $s):(),
 		);
 
 # shove in bugs which affect this package if there is a package or a
@@ -390,6 +401,7 @@ if (not exists $param{affects} and not exists $param{noaffects} and
 			  grep {$_ ne 'newest'}
 			  keys %package_search_keys, 'archive'),
 			 usertags => \%ut,
+                         defined $s?(schema => $s):(),
 			);
 }
 
@@ -434,6 +446,7 @@ my $result = pkg_htmlizebugs(bugs => \@bugs,
 			     exclude => $exclude,
 			     this => $this,
 			     options => \%param,
+                             defined $s?(schema => $s):(),
 			     (exists $param{dist})?(dist    => $param{dist}):(),
 			    );
 
@@ -495,6 +508,9 @@ print fill_in_template(template=>'cgi/pkgreport_javascript');
 
 print qq(<h2 class="outstanding"><!--<a class="options" href="javascript:toggle(1)">-->Options<!--</a>--></h2>\n);
 
+$param{orderings} =
+    [uniq((grep {!$hidden{$_}} keys %cats),
+	  $param{ordering})];
 print option_form(template => 'cgi/pkgreport_options',
 		  param    => \%param,
 		  form_options => $form_options,