From 27c6c39fbc8ded5fd315314cefd4af2963734ed4 Mon Sep 17 00:00:00 2001 From: Rich Date: Mon, 26 Mar 2012 13:32:45 +0000 Subject: [PATCH] Fixed code that converts the search string into a regular expression search string. This fixed a number of problems including the search for the percent symbol as described in B2012-089. --- PROMS/Volian.Print.Library/PDFReport.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 3af74491..6eedd0b1 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -549,11 +549,16 @@ namespace Volian.Print.Library if (_RegexSearchString == null) { _RegexSearchString = _SearchString; - if (_RegexSearchString[0] == '%') - _RegexSearchString = _RegexSearchString.Substring(1); - if (_RegexSearchString[_RegexSearchString.Length - 1] == '%') - _RegexSearchString = _RegexSearchString.Substring(0, _RegexSearchString.Length - 1); - _RegexSearchString = _RegexSearchString.Replace("%", ".*"); + // Make it match the smallest matching string + _RegexSearchString = _RegexSearchString.Replace("*", ".*?"); + // If search string starts with a wildcard use the beginning of line token (^) + if (_RegexSearchString.StartsWith(".*?")) + _RegexSearchString = "^" + _RegexSearchString; + // If search string ends with a wildcard use the end of line token ($) + if(_RegexSearchString.EndsWith(".*?")) + _RegexSearchString = _RegexSearchString+"$"; + _RegexSearchString = _RegexSearchString.Replace("[", @"\["); + _RegexSearchString = _RegexSearchString.Replace("]", @"\]"); } return _RegexSearchString; }