From 2b5ccd94439caafc7b6cc2352b73117d139ceb05 Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Sun, 6 Oct 2013 00:18:55 -0700 Subject: [PATCH] updates to jira parcer --- indra/llui/llurlentry.cpp | 5 ++--- indra/llui/llurlregistry.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 130d7446ea..d261065485 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -1235,7 +1235,7 @@ std::string LLUrlEntryIcon::getIcon(const std::string &url) // LLUrlEntryJira::LLUrlEntryJira() { - mPattern = boost::regex("((?:ARVD|BUG|CHOP|CHUIBUG|DOC|DN|ECC|EXP|FIRE|LEAP|LLSD|MAINT|MATBUG|OPEN|PATHBUG|PHOE|PLAT|PYO|SCR|SEC|SH|SINV|SOCIAL|STORM|SUP|SVC|SPOT|VWR|WEB)-\\d+)", + mPattern = boost::regex("((?:ARVD|BUG|CHOP|CHUIBUG|DOC|DN|ECC|EXP|FIRE|LEAP|LLSD|MATBUG|MISC|OPEN|PATHBUG|PLAT|PYO|SCR|SH|SINV|SLS|SOCIAL|STORM|SVC|SPOT|SUN|SUP|TPV|VWR|WEB)-\\d+)", // FIRE-917: Match case to reduce number of false positives //boost::regex::perl|boost::regex::icase); boost::regex::perl); @@ -1255,8 +1255,7 @@ std::string LLUrlEntryJira::getTooltip(const std::string &string) const std::string LLUrlEntryJira::getUrl(const std::string &string) const { - if (string.find("PHOE") != std::string::npos || - string.find("FIRE") != std::string::npos || + if (string.find("FIRE") != std::string::npos || string.find("SLS") != std::string::npos || string.find("SUP") != std::string::npos ) { diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 04da58bd0b..00a5634b4e 100755 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -163,7 +163,9 @@ static bool stringHasJira(const std::string &text) { // same as above, but for jiras return (text.find("ARVD") != std::string::npos || + text.find("BUG") != std::string::npos || text.find("CHOP") != std::string::npos || + text.find("CHUIBUG") != std::string::npos || text.find("CTS") != std::string::npos || text.find("DOC") != std::string::npos || text.find("DN") != std::string::npos || @@ -172,22 +174,24 @@ static bool stringHasJira(const std::string &text) text.find("FIRE") != std::string::npos || text.find("LEAP") != std::string::npos || text.find("LLSD") != std::string::npos || - text.find("MAINT") != std::string::npos || + text.find("MATBUG") != std::string::npos || text.find("MISC") != std::string::npos || text.find("OPEN") != std::string::npos || text.find("PATHBUG") != std::string::npos || - text.find("PHOE") != std::string::npos || text.find("PLAT") != std::string::npos || text.find("PYO") != std::string::npos || text.find("SCR") != std::string::npos || - text.find("SEC") != std::string::npos || text.find("SH") != std::string::npos || text.find("SINV") != std::string::npos || + text.find("SLS") != std::string::npos || text.find("SNOW") != std::string::npos || text.find("SOCIAL") != std::string::npos || text.find("SPOT") != std::string::npos || text.find("STORM") != std::string::npos || + text.find("SUN") != std::string::npos || + text.find("SUP") != std::string::npos || text.find("SVC") != std::string::npos || + text.find("TPV") != std::string::npos || text.find("VWR") != std::string::npos || text.find("WEB") != std::string::npos); }