fix covertitle2 pagelist token processing

This commit is contained in:
Kathy Ruffing 2013-11-07 16:07:02 +00:00
parent 394afb7c63
commit 9bea7abb56

View File

@ -1173,6 +1173,9 @@ namespace Volian.Print.Library
ProcDescrList pdl = section.ActiveFormat.PlantFormat.FormatData.PrintData.ProcDescrList; ProcDescrList pdl = section.ActiveFormat.PlantFormat.FormatData.PrintData.ProcDescrList;
if (pdl != null && pdl.Count > 0) if (pdl != null && pdl.Count > 0)
{ {
// the following line is needed for FNP: a checkin needed to be done for Robinson and
// did not want to include the commented out lines in this 'case' statement group:
//string procnum = section.MyProcedure.MyContent.Number.Replace(@"\u8209?", "-"); // uncomment for FNP
string procnum = section.MyProcedure.MyContent.Number; string procnum = section.MyProcedure.MyContent.Number;
foreach (ProcDescr pd in pdl) foreach (ProcDescr pd in pdl)
{ {
@ -1184,7 +1187,10 @@ namespace Volian.Print.Library
} }
if (pd.MatchProcNumber == "@") if (pd.MatchProcNumber == "@")
{ {
plstr = pd.ProcDescr1; //if (Regex.IsMatch(procnum, "^[A-Za-z]+$")) // uncomment for FNP
plstr = pd.ProcDescr1;
//else // uncomment for FNP
// plstr = ""; // uncomment for FNP
break; break;
} }
} }
@ -1388,7 +1394,8 @@ namespace Volian.Print.Library
{ {
lnCnt++; lnCnt++;
if (lnCnt == 1) continue; if (lnCnt == 1) continue;
svgGroup.Add(PageItemToSvgText(pageItem, line, yOffset)); plstr = plstr.Replace(match, line);
svgGroup.Add(PageItemToSvgText(pageItem, plstr, yOffset));
yOffset += 12; yOffset += 12;
} }
return plstr; return plstr;