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

B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview #729

Merged
jjenko merged 5 commits from B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview into Development 2026-03-10 13:23:59 -04:00
Conversation 5 Commits 5 Files Changed 3 +49 -7
plarsen commented 2026-03-08 11:34:38 -04:00
Owner
Copy Link

B2026-025 Unicode removed from RO menu titles in treeview.

B2026-025 Unicode removed from RO menu titles in treeview.
B2026-025 Unicode removed from RO menu titles in treeview.docx
33 KiB
plarsen self-assigned this 2026-03-08 11:34:38 -04:00
jjenko was assigned by plarsen 2026-03-08 11:34:38 -04:00
mvickers was assigned by plarsen 2026-03-08 11:34:38 -04:00
plarsen added 1 commit 2026-03-08 11:34:38 -04:00
B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview a0be60a1b9
plarsen requested review from jjenko 2026-03-08 11:34:38 -04:00
mschill requested changes 2026-03-09 07:09:20 -04:00
Dismissed
mschill left a comment
Owner
Copy Link

See notes.

See notes.
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2189,0 +2190,4 @@
char[] chrAry = xmlstr.ToCharArray();
foreach (int chr in chrAry)
{
if (chr > 160)
mschill commented 2026-03-09 07:06:08 -04:00
Owner
Copy Link

should this be 160 or 166?

In ctlXMLEdit.cs you have:

				{
					if (chr > 166)
					{
						result1.Append($"\\u{(int)chr}?");
					}
					else
					{
						result1.Append((char)chr);
					}

could be mistaken, but would think this would be consistent?

should this be 160 or 166? In ctlXMLEdit.cs you have: { if (chr > 166) { result1.Append($"\\u{(int)chr}?"); } else { result1.Append((char)chr); } could be mistaken, but would think this would be consistent?
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2210,3 +2224,3 @@
strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp + "');";
mschill commented 2026-03-09 07:09:00 -04:00
Owner
Copy Link

Ideally, these inserts would be done a different way as concatenating SQL together like this could risk sql injection --- that being said - I believe that would be beyond the scope of this project / CSM item.

Ideally, these inserts would be done a different way as concatenating SQL together like this could risk sql injection --- that being said - I believe that would be beyond the scope of this project / CSM item.
PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs Outdated
@@ -518,3 +519,3 @@
cnt++;
}
if ((cnt + text.Length) > frmt2) // longer than the field length?
// string sym = symbcode < 256 ? ((char)symbcode).ToString() : string.Format(@"\u{0}", symbcode);
mschill commented 2026-03-09 06:49:57 -04:00
Owner
Copy Link

Should commented out code be removed?

Should commented out code be removed?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs
@@ -519,2 +520,3 @@
}
if ((cnt + text.Length) > frmt2) // longer than the field length?
// string sym = symbcode < 256 ? ((char)symbcode).ToString() : string.Format(@"\u{0}", symbcode);
text = Regex.Replace(text, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); //B2026-025 Unicode removed from RO menu titles in treeview.
mschill commented 2026-03-09 06:51:53 -04:00
Owner
Copy Link

Does there need to be a null check / try parse here?

Does there need to be a null check / try parse here?
mschill marked this conversation as resolved
plarsen added 1 commit 2026-03-09 11:38:54 -04:00
B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview 955ffc48d3
mschill requested changes 2026-03-09 12:41:13 -04:00
Dismissed
mschill left a comment
Owner
Copy Link

see notes - let me know if you have any questions.

see notes - let me know if you have any questions.
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2146,0 +2146,4 @@
char[] chrAry = xmlstr.ToCharArray();
foreach (int chr in chrAry)
{
if (chr > 160)
mschill commented 2026-03-09 12:34:10 -04:00
Owner
Copy Link

should this be 160 or 166?

In ctlXMLEdit.cs you have:

			{
				if (chr > 166)
				{
					result1.Append($"\\u{(int)chr}?");
				}
				else
				{
					result1.Append((char)chr);
				}

could be mistaken, but would think this would be consistent?

should this be 160 or 166? In ctlXMLEdit.cs you have: { if (chr > 166) { result1.Append($"\\u{(int)chr}?"); } else { result1.Append((char)chr); } could be mistaken, but would think this would be consistent?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2146,0 +2155,4 @@
xmlstrTmp.Append((char)chr);
}
}
string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstrTmp + "'";
mschill commented 2026-03-09 12:38:37 -04:00
Owner
Copy Link

here - it looks like you are concatenating a stringbuilder with a string --- should

this line have xmlstrTmp.ToString() instead?

here - it looks like you are concatenating a stringbuilder with a string --- should this line have xmlstrTmp.ToString() instead?
plarsen commented 2026-03-09 13:48:58 -04:00
Author
Owner
Copy Link

Well in my testing the data was saved just fine, but I will added the tostring(). I do not think it will hurt.

Well in my testing the data was saved just fine, but I will added the tostring(). I do not think it will hurt.
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2189,0 +2203,4 @@
char[] chrAry = xmlstr.ToCharArray();
foreach (int chr in chrAry)
{
if (chr > 160)
mschill commented 2026-03-09 12:34:31 -04:00
Owner
Copy Link

should this be 160 or 166?

In ctlXMLEdit.cs you have:

			{
				if (chr > 166)
				{
					result1.Append($"\\u{(int)chr}?");
				}
				else
				{
					result1.Append((char)chr);
				}

could be mistaken, but would think this would be consistent?

should this be 160 or 166? In ctlXMLEdit.cs you have: { if (chr > 166) { result1.Append($"\\u{(int)chr}?"); } else { result1.Append((char)chr); } could be mistaken, but would think this would be consistent?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2210,3 +2237,3 @@
strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp + "');";
mschill commented 2026-03-09 12:39:07 -04:00
Owner
Copy Link

here - it looks like you are concatenating a stringbuilder with a string --- should

this line have xmlstrTmp.ToString() instead?

here - it looks like you are concatenating a stringbuilder with a string --- should this line have xmlstrTmp.ToString() instead?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2216,3 +2243,3 @@
strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, Info ) ";
strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
strInsert = strInsert + "','" + dt + "','" + xmlstr + "');";
strInsert = strInsert + "','" + dt + "','" + xmlstrTmp + "');";
mschill commented 2026-03-09 12:40:28 -04:00
Owner
Copy Link

here - it looks like you are concatenating a stringbuilder with a string --- should

this line have xmlstrTmp.ToString() instead?

here - it looks like you are concatenating a stringbuilder with a string --- should this line have xmlstrTmp.ToString() instead?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2224,3 +2251,3 @@
strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageId, ModDateTime, Info ) ";
strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.RRO + ",'" + ro.GetAttribute("ParentID");
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstrTmp + "');";
mschill commented 2026-03-09 12:39:14 -04:00
Owner
Copy Link

here - it looks like you are concatenating a stringbuilder with a string --- should

this line have xmlstrTmp.ToString() instead?

here - it looks like you are concatenating a stringbuilder with a string --- should this line have xmlstrTmp.ToString() instead?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2635,0 +2662,4 @@
char[] chrAry = tinfo2.ToCharArray();
foreach (int chr in chrAry)
{
if (chr > 160)
mschill commented 2026-03-09 12:34:57 -04:00
Owner
Copy Link

should this be 160 or 166?

In ctlXMLEdit.cs you have:

			{
				if (chr > 166)
				{
					result1.Append($"\\u{(int)chr}?");
				}
				else
				{
					result1.Append((char)chr);
				}

could be mistaken, but would think this would be consistent?

should this be 160 or 166? In ctlXMLEdit.cs you have: { if (chr > 166) { result1.Append($"\\u{(int)chr}?"); } else { result1.Append((char)chr); } could be mistaken, but would think this would be consistent?
mschill marked this conversation as resolved
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs Outdated
@@ -2635,0 +2671,4 @@
tinfo2Tmp.Append((char)chr);
}
}
str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp + "'";
mschill commented 2026-03-09 12:37:25 -04:00
Owner
Copy Link

here - it looks like you are concatenating a stringbuilder with a string --- should

str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp + "'";

be

str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp.ToString() + "'";

?

here - it looks like you are concatenating a stringbuilder with a string --- should str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp + "'"; be str = "UPDATE " + echild.GetAttribute("Table") + " SET Info = '" + tinfo2Tmp.ToString() + "'"; ?
mschill marked this conversation as resolved
plarsen added 1 commit 2026-03-09 14:23:57 -04:00
B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview 33cc650871
plarsen added 1 commit 2026-03-10 11:48:09 -04:00
B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview 13b03f4f89
plarsen added 1 commit 2026-03-10 11:54:29 -04:00
Merge branch 'Development' into B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview 9879a80569
mschill approved these changes 2026-03-10 13:04:18 -04:00
mschill left a comment
Owner
Copy Link

Looks good. Ready for QA.

Looks good. Ready for QA.
jjenko approved these changes 2026-03-10 13:23:43 -04:00
jjenko left a comment
Owner
Copy Link

changes look good

changes look good
jjenko merged commit 1e12c82be4 into Development 2026-03-10 13:23:59 -04:00
mvickers commented 2026-03-10 15:47:25 -04:00
Member
Copy Link

Final update was put on 3/10/26. Tested with PROMS version 2.3.2603.1014 and verified no unicode symbols displayed anywhere.

Final update was put on 3/10/26. Tested with PROMS version 2.3.2603.1014 and verified no unicode symbols displayed anywhere.
Sign in to join this conversation.
Reviewers
No Reviewers
mschill
jjenko
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
djankowski jjenko lbutler mschill mvickers plarsen
No Assignees plarsen jjenko mvickers
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Volian/SourceCode#729
Delete Branch "B2026-025_Unicode_removed_from_RO_menu_titles_in_treeview"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?