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

C2021-051: Use all Applicability tokens in Procedure Set and Folder Specific information in page list items

Browse Source
This commit is contained in:
Kathy Ruffing
2021-10-20 12:54:06 +00:00
parent bfaad2aa6a
commit 9db537d288
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@@ -2163,6 +2163,12 @@ i = 0;
if (qindx == -1)
{
val = DocVersionInfo.GetInheritedSIValue(section.MyProcedure, token.Substring(4, token.Length - 5));
// C2021-051: Applicability tokens in Procedure Set and Folder Specific Information
if (val.ToUpper().Contains("<U>") || val.ToUpper().Contains("<U-")) // Replace token with the applicable unit information
{
string unbr3 = ResolveUnitApp(MySection.MyDocVersion, val);
plstr = unbr3 ?? "";
}
plstr = plstr.Replace(token, val);
break; // B2019-134 break out of switch statement after processing the <SI- token so that it can loop and handle any other tokens on the same line
}
@@ -2170,10 +2176,12 @@ i = 0;
{
string pstok = token.Substring(indx + 1, qindx - indx - 1);
plstr = DocVersionInfo.GetInheritedSIValue(section.MyProcedure, pstok);
//if (dvConfig != null)
// plstr = dvConfig.GetValue("SI", pstok);
//if ((plstr == null || plstr == "") && folderConfig != null)
// plstr = folderConfig.GetValue("SI", pstok);
// C2021-051: Applicability tokens in Procedure Set and Folder Specific Information
if (plstr.ToUpper().Contains("<U>") || val.ToUpper().Contains("<U-")) // Replace token with the applicable unit information
{
string unbr3 = ResolveUnitApp(MySection.MyDocVersion, val);
plstr = unbr3 ?? "";
}
// the first part of the string between the ? and ' ' is the other logical
// to see if it's on. If on, just use col and/or row as defined. Otherwise use
// value between = and |.