refs #649, info reader and shared URLs

This commit is contained in:
Klaus Basan
2016-05-24 00:21:29 +02:00
parent 74638c4c10
commit 239f410cef
2 changed files with 20 additions and 9 deletions

View File

@@ -28,13 +28,8 @@ namespace BlackCore
{ {
CGlobalSetup::CGlobalSetup() : CGlobalSetup::CGlobalSetup() :
ITimestampBased(0), ITimestampBased(0),
m_dbRootDirectoryUrl("http://ubuntu12/swiftdatastore/public"), m_dbRootDirectoryUrl("http://ubuntu12/swiftdatastore/public"), m_vatsimBookingsUrl("http://vatbook.euroutepro.com/xml2.php"),
m_vatsimBookingsUrl("http://vatbook.euroutepro.com/xml2.php"), m_vatsimMetarsUrls( {"http://metar.vatsim.net/metar.php"}), m_vatsimStatusFileUrls({ "https://status.vatsim.net" }), m_vatsimDataFileUrls({ "http://info.vroute.net/vatsim-data.txt" }), m_sharedUrls(CBuildConfig::swiftTeamDefaultServers()), m_newsUrls(QStringList({ "http://swift-project.org/" }))
m_vatsimMetarsUrls( {"http://metar.vatsim.net/metar.php"}),
m_vatsimStatusFileUrls({ "https://status.vatsim.net" }),
m_vatsimDataFileUrls({ "http://info.vroute.net/vatsim-data.txt" }),
m_sharedUrls(CBuildConfig::swiftTeamDefaultServers()),
m_newsUrls(QStringList({ "http://swift-project.org/" }))
{ } { }
CUrl CGlobalSetup::getDbIcaoReaderUrl() const CUrl CGlobalSetup::getDbIcaoReaderUrl() const
@@ -47,6 +42,16 @@ namespace BlackCore
return getDbRootDirectoryUrl(); return getDbRootDirectoryUrl();
} }
CUrl CGlobalSetup::getDbInfoReaderUrl() const
{
return getDbRootDirectoryUrl();
}
const CUrlList &CGlobalSetup::getSwiftSharedUrls() const
{
return this->m_sharedUrls;
}
CUrl CGlobalSetup::getDbHomePageUrl() const CUrl CGlobalSetup::getDbHomePageUrl() const
{ {
return getDbRootDirectoryUrl().withAppendedPath("/page/index.php"); return getDbRootDirectoryUrl().withAppendedPath("/page/index.php");

View File

@@ -90,12 +90,18 @@ namespace BlackCore
//! Root directory of DB //! Root directory of DB
const BlackMisc::Network::CUrl &getDbRootDirectoryUrl() const { return m_dbRootDirectoryUrl; } const BlackMisc::Network::CUrl &getDbRootDirectoryUrl() const { return m_dbRootDirectoryUrl; }
//! ICAO Reader location //! ICAO reader URL
BlackMisc::Network::CUrl getDbIcaoReaderUrl() const; BlackMisc::Network::CUrl getDbIcaoReaderUrl() const;
//! Model Reader protocol //! Model reader URL
BlackMisc::Network::CUrl getDbModelReaderUrl() const; BlackMisc::Network::CUrl getDbModelReaderUrl() const;
//! Info data reader URL
BlackMisc::Network::CUrl getDbInfoReaderUrl() const;
//! Shared URLs
const BlackMisc::Network::CUrlList &getSwiftSharedUrls() const;
//! URL to read VATSIM bookings //! URL to read VATSIM bookings
const BlackMisc::Network::CUrl &getVatsimBookingsUrl() const { return m_vatsimBookingsUrl; } const BlackMisc::Network::CUrl &getVatsimBookingsUrl() const { return m_vatsimBookingsUrl; }