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

B2026 053 find unlinked values of selected #795

Merged
mschill merged 28 commits from B2026-053-Find-Unlinked-Values-of-Selected into Development 2026-07-30 15:29:20 -04:00
Conversation 10 Commits 28 Files Changed 1
+18 -29
1 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cfc324d31e - Show all commits
PROMS/Volian.Controls.Library/DisplaySearch.cs
+18 -29
View File
@@ -2016,20 +2016,17 @@ namespace Volian.Controls.Library
{ {
ReportTitle = string.Format("Search for '{0}'", TextSearchString); ReportTitle = string.Format("Search for '{0}'", TextSearchString);
// C2020-009: Search - Allow search 'By Word'. string byWordPrefix = string.Empty;
string byWordSuffix = string.Empty;
if (cbxByWord.Checked)
{
byWordPrefix = GetByWordSettings(TextSearchString, true);
byWordSuffix = GetByWordSettings(TextSearchString, false);
}
//if (cbxByWord.Checked) SearchString = TextSearchString;
//{
// // Generate a prefix & suffix to be used in the sql query around the search string.
// // If the search string starts (prefix)/ends(suffix) with a number, then use an expression that
// // does not allow the preceding/following text to have a number, '.', letter or other rtf
// // commands. If the search string starts/ends with a letter, then use an expression that does not
// // find the preceding/following text that is text, i.e. a letter.
SearchString = TextSearchString; SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, GetByWordSettings(TextSearchString, true), GetByWordSettings(TextSearchString, false));
cmbResultsStyleIndex = 3; // display step text in results cmbResultsStyleIndex = 3; // display step text in results
//} //}
@@ -2175,23 +2172,15 @@ namespace Volian.Controls.Library
} }
private string GetByWordSettings(string ss, bool checkstart) private string GetByWordSettings(string ss, bool checkstart)
{ {
//if (Regex.IsMatch(ss, @"^[\d\.]")) // starts with a number or '.' decimal pt
//{ // C2020-009: Search - Allow search 'By Word'.
// settings.Add("byWordPrefix", @"[^0-9a-zA-Z.vbpi:\\-]");
//} // // Generate a prefix & suffix to be used in the sql query around the search string.
//else if (Regex.IsMatch(ss, @"^[a-zA-Z]")) // starts with a letter // // If the search string starts (prefix)/ends(suffix) with a number, then use an expression that
//{ // // does not allow the preceding/following text to have a number, '.', letter or other rtf
// settings.Add("byWordPrefix", @"[^a-zA-Z]"); // // commands. If the search string starts/ends with a letter, then use an expression that does not
//} // // find the preceding/following text that is text, i.e. a letter.
//if (Regex.IsMatch(ss, @"^[\d\.]")) // ends with a number or decimal
//{
// settings.Add("byWordSuffix", @"[^0-9a-zA-Z.vbpi:\\-]");
//}
//else if (Regex.IsMatch(ss, @"[a-zA-Z]$")) // ends with a letter
//{
// settings.Add("byWordSuffix", @"[^a-zA-Z]");
//}
//return settings;
if (ss.Length > 0) if (ss.Length > 0)
{ {
//checking start //checking start