diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index 2befffa7..ecc87f0e 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -1013,7 +1013,7 @@ namespace Volian.Print.Library
}
if (val != null && val != "" && !PgLogicals.ContainsKey(pstok)) PgLogicals.Add(pstok, val != null);
//if (val == null || val == "")
- //val = " ";
+ //val = " ";
if (val == null)
val = "";
plstr = plstr.Replace(token, val);
@@ -1032,7 +1032,9 @@ namespace Volian.Print.Library
}
}
else
- ProcessPaglistToken(section, svgGroup, pageItem, ref useFontForCheckOffHeader, ref plstr, token);
+ {
+ if (!ProcessPaglistToken(section, svgGroup, pageItem, ref useFontForCheckOffHeader, ref plstr, token)) break;
+ }
} // end foreach matches
if (plstr.StartsWith("RO_Lookup("))
{
@@ -1109,8 +1111,22 @@ namespace Volian.Print.Library
get { return _HLRNO; }
set { _HLRNO = value; }
}
- private void ProcessPaglistToken(VEPROMS.CSLA.Library.SectionInfo section, SvgGroup svgGroup, VEPROMS.CSLA.Library.PageItem pageItem, ref VE_Font useFontForCheckOffHeader, ref string plstr, string token)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// true - if token is resolved
+ /// false - if entire text is processed
+ ///
+ private bool ProcessPaglistToken(VEPROMS.CSLA.Library.SectionInfo section, SvgGroup svgGroup, VEPROMS.CSLA.Library.PageItem pageItem, ref VE_Font useFontForCheckOffHeader, ref string plstr, string token)
{
+ bool retval = true;
+
//Console.WriteLine("{0} ProcessPagelistToken", token);
// Paglist token inside a PS= conditional are surrounded by square brackets instead of curley
// ex. [BOX3] instead of {BOX3}, thus the redunant looking cases
@@ -1515,12 +1531,17 @@ namespace Volian.Print.Library
else
{
if (plstr != "")
+ {
svgGroup.Add(PageItemToSvgText(pageItem, plstr, MySection));
+ plstr = "";
+ }
//svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token));
}
//_MyLog.InfoFormat("Token not processed {0}", token);
+ if (plstr == "") retval = false;
break;
}
+ return retval;
}
private string GetAttachNum1()