From 144c47058535c630991b466ac80346a30852cb13 Mon Sep 17 00:00:00 2001 From: "dave%intrec.com" <> Date: Thu, 25 Jan 2001 06:24:06 +0000 Subject: Fix for bug 30694: adds title attributes to bug links with bug status and description. Patch by jake@acutex.net --- globals.pl | 64 +++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 19 deletions(-) (limited to 'globals.pl') diff --git a/globals.pl b/globals.pl index 34f6b3cf5..6f4e86a32 100644 --- a/globals.pl +++ b/globals.pl @@ -673,11 +673,6 @@ sub quoteUrls { my ($knownattachments, $text) = (@_); return $text unless $text; - # make sure that any unfetched data from a currently running query - # is saved off rather than overwritten - # - PushGlobalSQLState(); - my $base = Param('urlbase'); my $protocol = join '|', @@ -716,23 +711,15 @@ sub quoteUrls { while ($text =~ s/\bbug(\s|%\#)*(\d+)/"##$count##"/ei) { my $item = $&; my $num = $2; - SendSQL("select bugs.bug_status, short_desc - from bugs where bugs.bug_id = $num"); - my ($stat, $dep_desc) = (FetchSQLData()); - $item = value_quote($item); # Not really necessary, since we know - # there's no special chars in it. - $dep_desc = value_quote($dep_desc); - $item = qq{$item}; + $item = GetBugLink($num, $item); $things[$count++] = $item; } while ($text =~ s/\*\*\* This bug has been marked as a duplicate of (\d+) \*\*\*/"##$count##"/ei) { my $item = $&; my $num = $1; - SendSQL("select bugs.bug_status, short_desc - from bugs where bugs.bug_id = $num"); - my ($stat, $dep_desc) = (FetchSQLData()); - $dep_desc = value_quote($dep_desc); - $item =~ s@\d+@$num@; + my $bug_link; + $bug_link = GetBugLink($num, $num); + $item =~ s@\d+@$bug_link@; $things[$count++] = $item; } while ($text =~ s/Created an attachment \(id=(\d+)\)/"##$count##"/e) { @@ -755,10 +742,49 @@ sub quoteUrls { # And undo the quoting of "#" characters. $text =~ s/%#/#/g; - # put back any query info in progress + return $text; +} + +# This is a new subroutine written 12/20/00 for the purpose of processing a +# link to a bug. It can be called using "GetBugLink (, );" +# Where is the number of the bug and is what apprears +# between '' and ''. + +sub GetBugLink { + my ($bug_num, $link_text) = (@_); + my ($link_return) = ""; + + # TODO - Add caching capabilites... possibly use a global variable in the form + # of $buglink{$bug_num} that contains the text returned by this sub. If that + # variable is defined, simply return it's value rather than running the SQL + # query. This would cut down on the number of SQL calls when the same bug is + # referenced multiple times. + + # Make sure any unfetched data from a currently running query + # is saved off rather than overwritten + PushGlobalSQLState(); + + # Get this bug's info from the SQL Database + SendSQL("select bugs.bug_status, resolution, short_desc + from bugs where bugs.bug_id = $bug_num"); + my ($bug_stat, $bug_res, $bug_desc) = (FetchSQLData()); + + # Format the retrieved information into a link + if ($bug_stat eq "UNCONFIRMED") { $link_return .= "" } + if ($bug_res ne "") { $link_return .= "" } + $bug_desc = value_quote($bug_desc); + $link_text = value_quote($link_text); + $link_return .= qq{$link_text}; + if ($bug_res ne "") { $link_return .= "" } + if ($bug_stat eq "UNCONFIRMED") { $link_return .= ""} + + # Put back any query in progress PopGlobalSQLState(); - return $text; + return $link_return; + } sub GetLongDescriptionAsText { -- cgit v1.2.3-24-g4f1b