Fixed logic so that Point Beach AOP-9C will print.

This commit is contained in:
Rich 2013-12-06 20:38:55 +00:00
parent 067f004170
commit aa652f5b73

View File

@ -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;