skip bad .debinfo files when loading them

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 013175b01d2fe10c2336eb87a9a5f6502a45c06d..226258a1b26063fc48ed17d9ef5470289a3412c2 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -24,6 +24,7 @@ use Debbugs::CGI qw(:url :html :util :cache :usertags);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
 use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::DB;
 use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity);
 
 use Scalar::Util qw(looks_like_number);
@@ -32,6 +33,11 @@ use Debbugs::Text qw(:templates);
 use URI::Escape qw(uri_escape_utf8);
 use List::AllUtils qw(max);
 
+my $s;
+if (defined $config{database}) {
+    $s = Debbugs::DB->connect($config{database}) or
+        die "Unable to connect to database";
+}
 
 use CGI::Simple;
 my $q = new CGI::Simple;
@@ -188,6 +194,7 @@ my %status;
 if ($need_status) {
     %status = %{split_status_fields(get_bug_status(bug=>$ref,
                                                   bugusertags => \%bugusertags,
+                                                   defined $s?(schema => $s):(),
                                                  ))}
 }
 
@@ -461,7 +468,6 @@ print fill_in_template(template => 'cgi/bugreport',
                       hole_var  => {'&package_links' => \&Debbugs::CGI::package_links,
                                     '&bug_links'     => \&Debbugs::CGI::bug_links,
                                     '&version_url'   => \&Debbugs::CGI::version_url,
-                                    '&bug_url'       => \&Debbugs::CGI::bug_url,
                                     '&strftime'      => \&POSIX::strftime,
                                     '&maybelink'     => \&Debbugs::CGI::maybelink,
                                    },