From 5818051fbeb4aec81dd2b9ab861d149ee2f2e10f Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Mon, 20 Aug 2007 23:04:19 +0000 Subject: Bug 257351: collectstats.pl dies if an invalid series is defined - Patch by Frédéric Buclin r/a=mkanat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collectstats.pl | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'collectstats.pl') diff --git a/collectstats.pl b/collectstats.pl index 730b8c50f..a1ab9b2d1 100755 --- a/collectstats.pl +++ b/collectstats.pl @@ -579,22 +579,19 @@ sub CollectSeriesData { # We set up the user for Search.pm's permission checking - each series # runs with the permissions of its creator. my $user = new Bugzilla::User($serieses->{$series_id}->{'creator'}); - my $cgi = new Bugzilla::CGI($serieses->{$series_id}->{'query'}); - my $search = new Bugzilla::Search('params' => $cgi, - 'fields' => ["bugs.bug_id"], - 'user' => $user); - my $sql = $search->getSQL(); - my $data; - - # We can't die if we get dodgy SQL back for whatever reason, so we - # eval() this and, if it fails, just ignore it and carry on. - # One day we might even log an error. - eval { + + # Do not die if Search->new() detects invalid data, such as an obsolete + # login name or a renamed product or component, etc. + eval { + my $search = new Bugzilla::Search('params' => $cgi, + 'fields' => ["bugs.bug_id"], + 'user' => $user); + my $sql = $search->getSQL(); $data = $shadow_dbh->selectall_arrayref($sql); }; - + if (!$@) { # We need to count the returned rows. Without subselects, we can't # do this directly in the SQL for all queries. So we do it by hand. -- cgit v1.2.3-24-g4f1b