Compare commits

..

No commits in common. "829dbf84da8e56f053f811083f01c3caee41d4f5" and "7b156c17f8eaf2fb406cc28885113c6984d46250" have entirely different histories.

13 changed files with 2 additions and 2 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -746,7 +746,7 @@ namespace RODBInterface
string csufx = string.Format("_PCCHILD{0}", pcChildIdx); string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
//applicValues += ","; //applicValues += ",";
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx); XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero if (cn == null)
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
else else
{ {

View File

@ -473,7 +473,7 @@ namespace ctlXMLEditLib
nd = node.SelectSingleNode(str); nd = node.SelectSingleNode(str);
// if not found with just the string, search the tree. // if not found with just the string, search the tree.
if (nd==null)nd = node.SelectSingleNode("*/"+str); if (nd==null)nd = node.SelectSingleNode("*/"+str);
if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero if (nd == null)
GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
else else
{ {