diff --git a/ServerLMS/Systems/processingsystem.h b/ServerLMS/Systems/processingsystem.h index febb29d..d412e7a 100644 --- a/ServerLMS/Systems/processingsystem.h +++ b/ServerLMS/Systems/processingsystem.h @@ -52,7 +52,6 @@ private: DataParser *dataParser; UpdateController *updateController; ProviderDBLMS* providerDBLMS; - UpdateController* updateController; }; #endif // PROCESSINGSYSTEM_H diff --git a/ServerLMS/Systems/tools.h b/ServerLMS/Systems/tools.h index b554bbc..cf5fd3e 100644 --- a/ServerLMS/Systems/tools.h +++ b/ServerLMS/Systems/tools.h @@ -15,8 +15,9 @@ static const QString staticDataFolderName = "StaticData"; static const QString applicationFolderName = "Application"; static const QString sharedDataFolderName = "SharedData"; -static const QString additionalFilesFolderName = "AdditionalFiles"; +static const QString additionalFilesFolderName = "RRJ-95NEW-100"; static const QString streamingAssetsFolderName = "StreamingAssets"; +static const QString versionFolderName = "StreamingVersion"; static const QString tempFile = staticDataFolderName + "/save.xml"; static const QString version = staticDataFolderName + "/version.xml"; static const QString versionListFile = staticDataFolderName + "/versionList.xml"; @@ -26,9 +27,6 @@ static const QString buildDataPath = "/Application/RRJLoader/RRJ_Data/"; static const QString tasksAMMfileName = "/tasksAmm.xml"; static const QString tasksFIMfileName = "/tasksFIM.xml"; static const QString clientHash = staticDataFolderName + "/clientHash.xml"; -static const QString tasksAMMfileName = "/tasksAmm.xml"; -static const QString tasksFIMfileName = "/tasksFIM.xml"; -static const QString clientHash = staticDataFolderName + "/clientHash.xml"; static const QString baseNameVersion = "base";//может вынести комманды куда нибудь? diff --git a/ServerLMS/Systems/updatecontroller.cpp b/ServerLMS/Systems/updatecontroller.cpp index e850c77..8225da9 100644 --- a/ServerLMS/Systems/updatecontroller.cpp +++ b/ServerLMS/Systems/updatecontroller.cpp @@ -364,7 +364,7 @@ QList* UpdateController::calculateHash(QString path) QByteArray UpdateController::getAdditionalFile(QString name) { - QString path = Tools::createSharedPath("/" + assetManager->getCurrentVersionData()->getViewName() + "/AdditionalFiles" + name); + QString path = Tools::createSharedPath("/" + assetManager->getCurrentVersionData()->getViewName() + "/" + additionalFilesFolderName + name); QFile addFile(path); QByteArray array; if(addFile.open(QIODevice::ReadOnly)){