From 239f410cef9db6d82c3cab582f916ca842666226 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 24 May 2016 00:21:29 +0200 Subject: [PATCH] refs #649, info reader and shared URLs --- src/blackcore/data/globalsetup.cpp | 19 ++++++++++++------- src/blackcore/data/globalsetup.h | 10 ++++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index a6f54339e..67bfc3347 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -28,13 +28,8 @@ namespace BlackCore { CGlobalSetup::CGlobalSetup() : ITimestampBased(0), - m_dbRootDirectoryUrl("http://ubuntu12/swiftdatastore/public"), - 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_dbRootDirectoryUrl("http://ubuntu12/swiftdatastore/public"), 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/" })) { } CUrl CGlobalSetup::getDbIcaoReaderUrl() const @@ -47,6 +42,16 @@ namespace BlackCore return getDbRootDirectoryUrl(); } + CUrl CGlobalSetup::getDbInfoReaderUrl() const + { + return getDbRootDirectoryUrl(); + } + + const CUrlList &CGlobalSetup::getSwiftSharedUrls() const + { + return this->m_sharedUrls; + } + CUrl CGlobalSetup::getDbHomePageUrl() const { return getDbRootDirectoryUrl().withAppendedPath("/page/index.php"); diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index fdae8f27f..2ac8d994b 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -90,12 +90,18 @@ namespace BlackCore //! Root directory of DB const BlackMisc::Network::CUrl &getDbRootDirectoryUrl() const { return m_dbRootDirectoryUrl; } - //! ICAO Reader location + //! ICAO reader URL BlackMisc::Network::CUrl getDbIcaoReaderUrl() const; - //! Model Reader protocol + //! Model reader URL 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 const BlackMisc::Network::CUrl &getVatsimBookingsUrl() const { return m_vatsimBookingsUrl; }