diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index b4ca04b..42c71ac 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -297,9 +297,9 @@ void RecognizeSystem::recognize(QTcpSocket *socket) QString xmlFileName = ""; if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM) - xmlFileName = "./AdditionalFiles/tasksFIM.xml"; + xmlFileName = "./" + additionalFilesFolderName + "/tasksFIM.xml"; else - xmlFileName = "./AdditionalFiles/tasksAMM.xml"; + xmlFileName = "./" + additionalFilesFolderName + "/tasksAMM.xml"; QFile xmlInFile(xmlFileName); if (!xmlInFile.open(QFile::ReadOnly | QFile::Text)) diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.cpp b/InstructorsAndTrainees/connectorToServer/Core/tools.cpp index 2d933c9..d719b39 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/tools.cpp @@ -27,7 +27,7 @@ QString Tools::createLocalPath(QString path) QString Tools::createFullPath(QString path) { QString fullPath; - qint8 pos = path.indexOf("AdditionalFiles"); + qint8 pos = path.indexOf(additionalFilesFolderName); QString localPath = path.remove(0,--pos); diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.h b/InstructorsAndTrainees/connectorToServer/Core/tools.h index cb040f0..a1d2df2 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tools.h +++ b/InstructorsAndTrainees/connectorToServer/Core/tools.h @@ -10,6 +10,7 @@ static QString applicationEXEName = "RRJ.exe"; static QString applicationFolderName = "/Application"; static QString staticDataFolderName = "StaticData"; +static QString additionalFilesFolderName = "RRJ-95NEW-100"; static QString streamingAssetsPath = "/Application/RRJLoader/RRJ_Data/StreamingAssets"; static QString hashFilename = staticDataFolderName + "/clientHash.xml"; static QString settingsName = staticDataFolderName + "/settings.xml"; diff --git a/ServerLMS/Systems/updatecontroller.cpp b/ServerLMS/Systems/updatecontroller.cpp index 24adc28..2c55a2e 100644 --- a/ServerLMS/Systems/updatecontroller.cpp +++ b/ServerLMS/Systems/updatecontroller.cpp @@ -364,7 +364,7 @@ QList* UpdateController::calculateHash(QString path) QString UpdateController::getPathAdditionalFile(QString name) { - QString path = Tools::createSharedPath("/" + assetManager->getCurrentVersionData()->getViewName() + "/AdditionalFiles" + name); + QString path = Tools::createSharedPath("/" + assetManager->getCurrentVersionData()->getViewName() + "/" + additionalFilesFolderName + name); return path; }