icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 04:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ConnectPro_v1.5' into ConnectPro_v1.6

Browse Source
This commit is contained in:
Chris Cameron
2020-08-17 10:16:05 -04:00
parent 27bb1e3482 66b8107233
commit 5ca76f7e7e
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ICD.Common.Utils/Globalization/IcdCultureInfo.cs
View File

@@ -97,9 +97,9 @@ namespace ICD.Common.Utils.Globalization
private const string SQL_LOCAL_DATABASE_FILE = "CultureInfo.sqlite";
private const string SQL_CONNECTION_STRING_FORMAT =
#if SIMPLSHARP
"Data Source = {0}; Version = 3; ReadOnly = True";
"Data Source={0};Version=3;ReadOnly=True";
#else
"Data Source = {0}";
"Data Source={0}";
#endif
private const string SQL_CMD_SELECT_BY_NAME = "select * from cultureinfo where name = @name collate nocase";
private const string SQL_CMD_SELECT_BY_LCID = "select * from cultureinfo where lcid = @lcid";

22
ICD.Common.Utils/Xml/IcdXmlReader.cs
View File

@@ -177,26 +177,16 @@ namespace ICD.Common.Utils.Xml
public long ReadElementContentAsLong()
{
try
{
return m_Reader.ReadElementContentAsLong();
}
catch (XmlException e)
{
throw new IcdXmlException(e);
}
// ReadElementContentAsLong() logs and throws...
string value = ReadElementContentAsString();
return long.Parse(value);
}
public float ReadElementContentAsFloat()
{
try
{
return m_Reader.ReadElementContentAsFloat();
}
catch (XmlException e)
{
throw new IcdXmlException(e);
}
// ReadElementContentAsFloat() logs and throws...
string value = ReadElementContentAsString();
return float.Parse(value);
}
public bool ReadElementContentAsBoolean()