Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Development

Browse Source
This commit is contained in:
Paul Larsen
2026-07-27 09:13:34 -04:00
parent ecec7b9f1a
commit 99fe567e78
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROMS/Volian.Controls.Library/DisplaySearch.cs
+8 -20
View File
@@ -2078,7 +2078,7 @@ namespace Volian.Controls.Library
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked) if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
{ {
string ROSearchList2 = checkPercentChar(ROSearchList); // match exact string string ROSearchList2 = exactsearch(ROSearchList); // match exact string
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results. // B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty); SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
cmbResultsStyleIndex = 3; // display step text in results cmbResultsStyleIndex = 3; // display step text in results
@@ -2191,32 +2191,20 @@ namespace Volian.Controls.Library
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks))); OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
} }
private string checkPercentChar(string SearchString) private string exactsearch(string SearchString) // B2026-053
{ {
string ss = ""; string ss = "";
string pattern = "%"; // Pattern to match the percentage sign int sl = SearchString.Length;
Match match = Regex.Match(SearchString, pattern); int LstIdxSp = SearchString.LastIndexOf(' ');
if (match.Success) // Special case for percents. if (sl == LstIdxSp + 1) // B2026-053 if ' ' the last char.
{ {
int sl = SearchString.Length; ss = ' ' + SearchString; //add a space prefix to make the search exact if the end of the search string is a space.
int precentIdx = SearchString.IndexOf('%');
int startIndex = 0;
if (sl == precentIdx + 1) // % the last char.
{
ss = SearchString.Substring(startIndex, sl - 1);
var isNumeric = int.TryParse(ss, out int n);
if (isNumeric == true) // other that a % are the rest of the characters numbers.
{
ss = ' ' + SearchString; //add a space prefix to make the search exact. If search is 5% this makes it excult 25% 55% etc.;
}
}
} }
else else
{ {
ss = ' ' + SearchString + ' '; // Exact match add spaces before and after search string. ss = ' ' + SearchString + ' '; // Exact match add spaces before and after search string.
} }
return ss; return ss;
} }
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click) private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)