Print Library, Svg Library, Utils Library, XYPlots
This commit is contained in:
@@ -1,12 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using vlnObjectLibrary;
|
||||
using System.Xml;
|
||||
using System.IO;
|
||||
using System.Data;
|
||||
using System.Data.OleDb;
|
||||
using System.Reflection;
|
||||
|
||||
namespace vlnServerLibrary
|
||||
{
|
||||
@@ -15,18 +13,10 @@ namespace vlnServerLibrary
|
||||
#region Log4Net
|
||||
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
|
||||
#endregion
|
||||
#region Static Properties
|
||||
private static string m_XmlControlPath = "vlnControl.xml";
|
||||
private static XmlDocument m_XmlControl;
|
||||
public static string XMLControlPath
|
||||
{
|
||||
get { return m_XmlControlPath; }
|
||||
set
|
||||
{
|
||||
m_XmlControlPath = value;
|
||||
}
|
||||
}
|
||||
public static XmlDocument XMLControl
|
||||
#region Static Properties
|
||||
private static XmlDocument m_XmlControl;
|
||||
public static string XMLControlPath { get; set; } = "vlnControl.xml";
|
||||
public static XmlDocument XMLControl
|
||||
{
|
||||
get
|
||||
{
|
||||
@@ -35,7 +25,7 @@ namespace vlnServerLibrary
|
||||
m_XmlControl = new XmlDocument();
|
||||
lock (m_XmlControl)
|
||||
{
|
||||
m_XmlControl.Load(m_XmlControlPath);
|
||||
m_XmlControl.Load(XMLControlPath);
|
||||
}
|
||||
}
|
||||
return m_XmlControl;
|
||||
@@ -75,11 +65,8 @@ namespace vlnServerLibrary
|
||||
string xPath = string.Format(".//dbObject[@type='{0}']/@{1}", o.Parent.Type, s);
|
||||
return LookUpX(o,xPath);
|
||||
}
|
||||
protected string LookUpX(vlnObject o,string xPath)
|
||||
{
|
||||
return LookUpX(o,xPath, XMLControl);
|
||||
}
|
||||
private void LoadChildrenFromDB(vlnObject o,string sSelect)
|
||||
protected string LookUpX(vlnObject o, string xPath) => LookUpX(o, xPath, XMLControl);
|
||||
private void LoadChildrenFromDB(vlnObject o,string sSelect)
|
||||
{
|
||||
if (sSelect != "")
|
||||
{
|
||||
@@ -89,7 +76,6 @@ namespace vlnServerLibrary
|
||||
OleDbConnectionStringBuilder csb = new OleDbConnectionStringBuilder(s);
|
||||
OleDbConnection dbConn = new OleDbConnection(csb.ConnectionString);
|
||||
string sTable = LookUp(o,"table");
|
||||
//if (dbConn.State != ConnectionState.Open) dbConn.Open();
|
||||
OleDbDataAdapter da = new OleDbDataAdapter(sSelect, dbConn);
|
||||
DataSet ds = new DataSet();
|
||||
da.Fill(ds, sTable);
|
||||
@@ -222,7 +208,7 @@ namespace vlnServerLibrary
|
||||
string sRetval = sDefault;
|
||||
if (sRetval[0] == '~')
|
||||
{
|
||||
string sTitlePath = sPath + "\\title";
|
||||
string sTitlePath = $"{sPath}\\title";
|
||||
if (File.Exists(sTitlePath))
|
||||
{
|
||||
StreamReader sr = File.OpenText(sTitlePath);
|
||||
|
||||
Reference in New Issue
Block a user