diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index e0239904b..0197bc43b 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -90,11 +90,6 @@ namespace BlackCore::Data return getDbRootDirectoryUrl().withAppendedPath("/service/jsonauthenticate.php").withSwitchedScheme("https", m_dbHttpsPort); } - CUrl CGlobalSetup::getAlphaXSwiftBusFilesServiceUrl() const - { - return getDbRootDirectoryUrl().withAppendedPath("/service/jsonalphaxswiftbusfiles.php").withSwitchedScheme("https", m_dbHttpsPort); - } - bool CGlobalSetup::dbDebugFlag() const { return m_dbDebugFlag && CBuildConfig::isLocalDeveloperDebugBuild(); diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index a5b9099b5..49b978a66 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -97,9 +97,6 @@ namespace BlackCore::Data //! \remark based on getDbRootDirectoryUrl BlackMisc::Network::CUrl getDbLoginServiceUrl() const; - //! alpha xswiftbus files available - BlackMisc::Network::CUrl getAlphaXSwiftBusFilesServiceUrl() const; - //! Shared URLs const BlackMisc::Network::CUrlList &getSwiftSharedUrls() const; diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index dcefe9ffe..6fe6df4ab 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -377,35 +377,6 @@ namespace BlackCore::Db if (!this->hasSharedFileHeader(entity)) { return e; } return m_sharedFileResponses[entity].getLastModifiedTimestamp(); } - - int CDatabaseReader::requestHeadersOfSharedFiles(CEntityFlags::Entity entities) - { - CEntityFlags::Entity allEntities = entities & CEntityFlags::AllDbEntitiesNoInfoObjects; - CEntityFlags::Entity currentEntity = CEntityFlags::iterateDbEntities(allEntities); - const CUrl urlSharedDbdata = CDatabaseReader::getSharedDbdataDirectoryUrl(); - if (urlSharedDbdata.isEmpty()) - { - CLogMessage(this).warning(u"No working shared URL, cannot request headers"); - return 0; - } - - int c = 0; - while (currentEntity != CEntityFlags::NoEntity) - { - const QString fileName = CDbInfo::entityToSharedName(currentEntity); - Q_ASSERT_X(!fileName.isEmpty(), Q_FUNC_INFO, "No file name for entity"); - CUrl url = urlSharedDbdata; - url.appendPath(fileName); - - const QString entityString = CEntityFlags::entitiesToString(currentEntity); - CLogMessage(this).info(u"Triggered read of header for shared file of '%1'") << entityString; - const QNetworkReply *reply = sApp->headerFromNetwork(url, { this, &CDatabaseReader::receivedSharedFileHeader }); - if (reply) { c++; } - currentEntity = CEntityFlags::iterateDbEntities(allEntities); - } - return c > 0; - } - bool CDatabaseReader::isSharedHeaderNewerThanCacheTimestamp(CEntityFlags::Entity entity) const { Q_ASSERT_X(CEntityFlags::isSingleEntity(entity), Q_FUNC_INFO, "need single entity"); @@ -716,12 +687,6 @@ namespace BlackCore::Db return q; } - const QString &CDatabaseReader::parameterLatestId() - { - static const QString p("latestId"); - return p; - } - const CUrl &CDatabaseReader::getDbUrl() { static const CUrl dbUrl(sApp->getGlobalSetup().getDbRootDirectoryUrl()); diff --git a/src/blackcore/db/databasereader.h b/src/blackcore/db/databasereader.h index 4ea7538cc..5e1a90850 100644 --- a/src/blackcore/db/databasereader.h +++ b/src/blackcore/db/databasereader.h @@ -254,10 +254,6 @@ namespace BlackCore::Db //! Those entities where the timestamp of a shared info object is newer than the cache timestamp BlackMisc::Network::CEntityFlags::Entity getEntitesWithNewerSharedInfoObject(BlackMisc::Network::CEntityFlags::Entity entities) const; - //! Request headers of shared file - //! \return number of requested headers - int requestHeadersOfSharedFiles(BlackMisc::Network::CEntityFlags::Entity entities); - //! Status message (error message) const QString &getStatusMessage() const; @@ -356,9 +352,6 @@ namespace BlackCore::Db //! Name of latest timestamp static const QString ¶meterLatestTimestamp(); - //! Name of parameter for latest id - static const QString ¶meterLatestId(); - //! A newer than value understood by swift DB //! \sa CDatabaseReader::parameterLatestTimestamp static QString dateTimeToDbLatestTs(const QDateTime &ts);