From aa652f5b73ee34e270ffbe5cefdad201fa5a0815 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 6 Dec 2013 20:38:55 +0000 Subject: [PATCH] Fixed logic so that Point Beach AOP-9C will print. --- .../Volian.Print.Library/VlnSvgPageHelper.cs | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index d1d2f6a4..6a08631b 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1179,20 +1179,25 @@ namespace Volian.Print.Library string procnum = section.MyProcedure.MyContent.Number; foreach (ProcDescr pd in pdl) { - string matchStr = (pd.MatchProcNumber.StartsWith("*}"))?pd.MatchProcNumber.Substring(2):pd.MatchProcNumber; - if (procnum.Contains(matchStr)) + if (pd.MatchProcNumber != null) { - plstr = pd.ProcDescr1; - break; - } - if (pd.MatchProcNumber == "@") - { - if (Regex.IsMatch(procnum, "^[A-Za-z]+$")) + string matchStr = (pd.MatchProcNumber.StartsWith("*}")) ? pd.MatchProcNumber.Substring(2) : pd.MatchProcNumber; + if (procnum.Contains(matchStr)) + { plstr = pd.ProcDescr1; - else - plstr = ""; - break; + break; + } + if (pd.MatchProcNumber == "@") + { + if (Regex.IsMatch(procnum, "^[A-Za-z]+$")) + plstr = pd.ProcDescr1; + else + plstr = ""; + break; + } } + else + plstr = "UNKNOWN"; } } break;