From 65a823060bb336ba4b5d3b544630f66e80337005 Mon Sep 17 00:00:00 2001
From: "terry%mozilla.org" <>
Date: Fri, 14 Jul 2000 03:04:14 +0000
Subject: Keywords were already enforced to never differ only in
capitalization. So, changed the code so that case no longer matters when
typing in the name of a keyword.
---
buglist.cgi | 3 +--
globals.pl | 11 ++++++++++-
process_bug.cgi | 3 +--
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/buglist.cgi b/buglist.cgi
index f1129cb53..2c509b06d 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -36,7 +36,6 @@ sub sillyness {
$zz = $::unconfirmedstate;
$zz = @::components;
$zz = @::default_column_list;
- $zz = @::keywordsbyname;
$zz = @::legal_keywords;
$zz = @::legal_platform;
$zz = @::legal_priority;
@@ -405,7 +404,7 @@ sub GenerateSQL {
if ($value eq '') {
next;
}
- my $id = $::keywordsbyname{$value};
+ my $id = GetKeywordIdFromName($name);
if ($id) {
push(@list, "$table.keywordid = $id");
} else {
diff --git a/globals.pl b/globals.pl
index 91ef44cee..58942ba01 100644
--- a/globals.pl
+++ b/globals.pl
@@ -104,7 +104,7 @@ sub SyncAnyPendingShadowChanges {
$shadowchanges = 0;
}
}
-
+
my $dosqllog = (-e "data/sqllog") && (-w "data/sqllog");
@@ -472,6 +472,7 @@ sub GenerateVersionTable {
SendSQL("SELECT id, name FROM keyworddefs ORDER BY name");
while (MoreSQLData()) {
my ($id, $name) = FetchSQLData();
+ $name = lc($name);
$::keywordsbyname{$name} = $id;
push(@::legal_keywords, $name);
}
@@ -485,6 +486,14 @@ sub GenerateVersionTable {
}
+sub GetKeywordIdFromName {
+ my ($name) = (@_);
+ $name = lc($name);
+ return $::keywordsbyname{$name};
+}
+
+
+
# Returns the modification time of a file.
diff --git a/process_bug.cgi b/process_bug.cgi
index f9ada112a..689034bd9 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -37,7 +37,6 @@ use vars %::versions,
%::components,
%::COOKIE,
%::MFORM,
- %::keywordsbyname,
%::legal_keywords,
%::legal_opsys,
%::legal_platform,
@@ -549,7 +548,7 @@ if ($::FORM{'keywords'}) {
if ($keyword eq '') {
next;
}
- my $i = $::keywordsbyname{$keyword};
+ my $i = GetKeywordIdFromName($keyword);
if (!$i) {
PuntTryAgain("Unknown keyword named $keyword
. " .
"
The legal keyword names are " . -- cgit v1.2.3-24-g4f1b