Changed My DB reference to Generic
Fixed a memory issue when opening Verison Properties Declare MissingTokens variable as static to reduce repetition in the Error Log.
This commit is contained in:
parent
faf4e1b5d9
commit
e80a615fa6
@ -88,9 +88,8 @@
|
|||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
|
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
|
||||||
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||||
<add name="VEPROMS_RMARK_DEBUGX" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||||
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS_WCNEMG_CM;Integrated Security=True" providerName="System.Data.SqlClient" />
|
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||||
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=VEPROMS_WCNEMG_CM;Integrated Security=True" providerName="System.Data.SqlClient" />
|
|
||||||
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB-HP;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB-HP;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||||
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB-HP;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB-HP;Initial Catalog=VEPROMS;Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
|
@ -44,7 +44,7 @@ namespace VEPROMS
|
|||||||
if (_SelectedROFst == null)
|
if (_SelectedROFst == null)
|
||||||
{
|
{
|
||||||
if (_DocVersionConfig.MyDocVersion.DocVersionAssociationCount < 1) return null;
|
if (_DocVersionConfig.MyDocVersion.DocVersionAssociationCount < 1) return null;
|
||||||
_SelectedROFst = ROFstInfo.Get(_DocVersionConfig.MyDocVersion.DocVersionAssociations[0].MyROFst.ROFstID);
|
_SelectedROFst = ROFstInfo.GetJustROFst(_DocVersionConfig.MyDocVersion.DocVersionAssociations[0].ROFstID);
|
||||||
}
|
}
|
||||||
return _SelectedROFst;
|
return _SelectedROFst;
|
||||||
}
|
}
|
||||||
@ -125,7 +125,7 @@ namespace VEPROMS
|
|||||||
// Get the ro path - there is no 'default'
|
// Get the ro path - there is no 'default'
|
||||||
if (_DocVersionConfig.MyDocVersion.DocVersionAssociationCount > 0)
|
if (_DocVersionConfig.MyDocVersion.DocVersionAssociationCount > 0)
|
||||||
{
|
{
|
||||||
RODbInfo rdi = RODbInfo.Get(SelectedROFst.MyRODb.RODbID);
|
RODbInfo rdi = RODbInfo.GetJustRODB(SelectedROFst.RODbID);
|
||||||
tbRoDb.Text = string.Format("{0} ({1})", rdi.ROName, rdi.FolderPath);
|
tbRoDb.Text = string.Format("{0} ({1})", rdi.ROName, rdi.FolderPath);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -887,7 +887,7 @@ namespace Volian.Print.Library
|
|||||||
if (svgText.Font.Underline && svgText.Text.EndsWith(" ")) svgText.Text = svgText.Text.Substring(0, svgText.Text.Length - 1) + "\xA0";// replace last space with a hardspace
|
if (svgText.Font.Underline && svgText.Text.EndsWith(" ")) svgText.Text = svgText.Text.Substring(0, svgText.Text.Length - 1) + "\xA0";// replace last space with a hardspace
|
||||||
return svgText;
|
return svgText;
|
||||||
}
|
}
|
||||||
private List<string> _MissingTokens = new List<string>();
|
private static List<string> _MissingTokens = new List<string>();
|
||||||
protected override string ReplacePageListToken(Match match)
|
protected override string ReplacePageListToken(Match match)
|
||||||
{
|
{
|
||||||
switch (match.Value)
|
switch (match.Value)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user