Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 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
+43 -48
1 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 954cc5918f - Show all commits
PROMS/Volian.Controls.Library/DisplaySearch.cs
+43 -48
View File
@@ -2017,35 +2017,21 @@ namespace Volian.Controls.Library
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)
{
// 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.
if (Regex.IsMatch(TextSearchString, @"^[\d\.]")) // starts with a number or '.' decimal pt
{
byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
}
else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter
{
byWordPrefix = @"[^a-zA-Z]";
}
if (Regex.IsMatch(TextSearchString, @"[\d\.]$")) // ends with a number or decimal
{
byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
}
else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter
{
byWordSuffix = @"[^a-zA-Z]";
}
}
//if (cbxByWord.Checked)
mschill commented 2026-07-30 14:05:49 -04:00
Outdated
Review
Copy Link
Copy Source

Was this if intentionally commented out? -- just checking since doesn't it change the logic around this other search --- for testing would make sure both searches tested with the different options.

Was this if intentionally commented out? -- just checking since doesn't it change the logic around this other search --- for testing would make sure both searches tested with the different options.
plarsen commented 2026-07-30 14:29:58 -04:00
Outdated
Review
Copy Link
Copy Source

Thanks, that code needs to be there and account of that I need to change the logic for updating the pre and post additions.

Thanks, that code needs to be there and account of that I need to change the logic for updating the pre and post additions.
//{
// // Generate a prefix & suffix to be used in the sql query around the search string.
jjenko marked this conversation as resolved Outdated
jjenko commented 2026-07-30 14:01:30 -04:00
Outdated
Review
Copy Link
Copy Source

Please move this descriptive comment (the stuff inside the curly braces) into the function you had created.

Then remove the rest of the stuff you had commented out.

Please move this descriptive comment (the stuff inside the curly braces) into the function you had created. Then remove the rest of the stuff you had commented out.
👍 1
// // 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;
// 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, byWordPrefix, byWordSuffix);
Dictionary<string, string> rtnByWord = GetByWordSettings(TextSearchString);
// 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, rtnByWord["byWordPrefix"], rtnByWord["byWordSuffix"]);
cmbResultsStyleIndex = 3; // display step text in results
//}
@@ -2078,27 +2064,10 @@ namespace Volian.Controls.Library
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
{
string byWordPrefix = string.Empty;
string byWordSuffix = string.Empty;
if (Regex.IsMatch(ROSearchList, @"^[\d\.]")) // starts with a number or '.' decimal pt
{
byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
}
else if (Regex.IsMatch(ROSearchList, @"^[a-zA-Z]")) // starts with a letter
{
byWordPrefix = @"[^a-zA-Z]";
}
if (Regex.IsMatch(ROSearchList, @"[\d\.]$")) // ends with a number or decimal
{
byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
}
else if (Regex.IsMatch(ROSearchList, @"[a-zA-Z]$")) // ends with a letter
{
byWordSuffix = @"[^a-zA-Z]";
}
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
Dictionary<string, string> rtnByWord = GetByWordSettings(ROSearchList);
SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, rtnByWord["byWordPrefix"], rtnByWord["byWordSuffix"]);
cmbResultsStyleIndex = 3; // display step text in results
}
else
3
 @@ -2208,6 +2177,32 @@ namespace Volian.Controls.Library
}
OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
jjenko marked this conversation as resolved Outdated
jjenko commented 2026-07-30 14:02:15 -04:00
Outdated
Review
Copy Link
Copy Source

Please remove the code you had commented out.

Please remove the code you had commented out.
👍 1
}
private Dictionary<string, string> GetByWordSettings(string ss)
{
Dictionary<string, string> settings = new Dictionary<string, string>();
string byWordPrefix = string.Empty;
mschill marked this conversation as resolved Outdated
mschill commented 2026-07-29 13:35:00 -04:00
Outdated
Review
Copy Link
Copy Source

Previous comments regarding Regexes still apply -- also it appears now we have 2 variables that we declared but did not use in string byWordPrefix & string byWordSuffix

Previous comments regarding Regexes still apply -- also it appears now we have 2 variables that we declared but did not use in string byWordPrefix & string byWordSuffix
plarsen commented 2026-07-29 13:54:28 -04:00
Outdated
Review
Copy Link
Copy Source

I removed the two unneeded variable declarations. I used what was previous used for the regex string. If you notice both tests are looking to see what the first character is and not the whole searchstring and from that it selects different regex strings. On account of this I am not sure char.IsNumeric will work because there are searchstrings that start with a number but are a mix of numbers and characters. Example 5% code: "if (Regex.IsMatch(ss, @"^[\d.]")) // starts with a number or '.' decimal pt"

I removed the two unneeded variable declarations. I used what was previous used for the regex string. If you notice both tests are looking to see what the first character is and not the whole searchstring and from that it selects different regex strings. On account of this I am not sure char.IsNumeric will work because there are searchstrings that start with a number but are a mix of numbers and characters. Example 5% code: "if (Regex.IsMatch(ss, @"^[\d\.]")) // starts with a number or '.' decimal pt"
string byWordSuffix = string.Empty;
if (Regex.IsMatch(ss, @"^[\d\.]")) // starts with a number or '.' decimal pt
{
settings.Add("byWordPrefix", @"[^0-9a-zA-Z.vbpi:\\-]");
}
else if (Regex.IsMatch(ss, @"^[a-zA-Z]")) // starts with a letter
{
settings.Add("byWordPrefix", @"[^a-zA-Z]");
jjenko marked this conversation as resolved Outdated
jjenko commented 2026-07-27 14:53:29 -04:00
Outdated
Review
Copy Link
Copy Source

by always adding a space before the search text, it will not find places where the unlinked RO Value is the first thing on the line. Ex. an Equipment List might have only the unlinked RO Value.

I noticed that the last two fields in the call to GetListFromTextSearch() are for a "by word" text search and passes in a Regx expression. Could that be used? - look for "if (cbxByWord.Checked)"

by always adding a space before the search text, it will not find places where the unlinked RO Value is the first thing on the line. Ex. an Equipment List might have only the unlinked RO Value. I noticed that the last two fields in the call to GetListFromTextSearch() are for a "by word" text search and passes in a Regx expression. Could that be used? - look for "if (cbxByWord.Checked)"
}
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]");
mschill marked this conversation as resolved Outdated
mschill commented 2026-07-24 10:59:55 -04:00
Outdated
Review
Copy Link
Copy Source

What if multiple % signs? - like search for:
3% or 4% --- I believe the matches returned by the Regex object will give position of what is found.

What if multiple % signs? - like search for: 3% or 4% --- I believe the matches returned by the Regex object will give position of what is found.
}
return settings;
}
private void ClearResults() // B2021-103 if no results when RNO only, clear results list. (moved from btnSearch_Click)
{
if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])
mschill marked this conversation as resolved Outdated
mschill commented 2026-07-24 11:02:50 -04:00
Outdated
Review
Copy Link
Copy Source

With working on tech debt project --- moving forward need to follow suggested code practices / suggestions by SonarLint --- if (isNumeric == true) should be
if (isNumeric)

With working on tech debt project --- moving forward need to follow suggested code practices / suggestions by SonarLint --- if (isNumeric == true) should be if (isNumeric)
5