diff --git a/ServerLMS/Systems/Parsers/dataparser.cpp b/ServerLMS/Systems/Parsers/dataparser.cpp index 1a8d63f..44a21fb 100644 --- a/ServerLMS/Systems/Parsers/dataparser.cpp +++ b/ServerLMS/Systems/Parsers/dataparser.cpp @@ -87,38 +87,6 @@ QByteArray DataParser::xmlAnswer(QList listTag, QString elemUp1, } -bool DataParser::loadXMLtoDOM(QString nameFile, QDomDocument *commonDOM) -{ - QFile blankFile(nameFile); - - if (! blankFile.open(QFile::ReadOnly | QFile::Text)) { - qDebug() << "loadBlankXML: Couldn't read the file: " + nameFile; - return false; - } - - commonDOM->setContent(blankFile.readAll()); - blankFile.close(); - - return true; -} - -bool DataParser::saveDOMtoXML(QString nameFile, QDomDocument *commonDOM) -{ - QFile xmlOutFile(nameFile); - if (!xmlOutFile.open(QFile::WriteOnly | QFile::Text)) - { - qDebug() << "saveDOMtoXML: Failed to write a file: " + nameFile; - return false; - } - else - { - QTextStream outFile(&xmlOutFile); - commonDOM->save(outFile, 4); - xmlOutFile.close(); - } - return true; -} - QByteArray DataParser::readTempFile() { QByteArray array; diff --git a/ServerLMS/Systems/Parsers/dataparser.h b/ServerLMS/Systems/Parsers/dataparser.h index c4b2da8..03db361 100644 --- a/ServerLMS/Systems/Parsers/dataparser.h +++ b/ServerLMS/Systems/Parsers/dataparser.h @@ -36,8 +36,6 @@ public: QByteArray xmlAnswer(QList listTag,QString elemUp1 = "", QString elemUp2 = ""); - static bool loadXMLtoDOM(QString nameFile, QDomDocument* commonDOM); - static bool saveDOMtoXML(QString nameFile, QDomDocument* commonDOM); ~DataParser(); ClientAnswerParser *ClientAnswer() const; diff --git a/ServerLMS/Systems/Parsers/dbanswerparser.cpp b/ServerLMS/Systems/Parsers/dbanswerparser.cpp index e835bd3..5ef7fe4 100644 --- a/ServerLMS/Systems/Parsers/dbanswerparser.cpp +++ b/ServerLMS/Systems/Parsers/dbanswerparser.cpp @@ -15,7 +15,7 @@ void DBAnswerParser::initialize(DataParser *dataParser) QByteArray DBAnswerParser::listInstructors(bool result, QList *listInstructors) { QDomDocument commonDOM; - if(! dataParser->loadXMLtoDOM(":/resources/blankXML/ListInstructors.xml", &commonDOM)) + if(! Tools::loadXMLtoDOM(":/resources/blankXML/ListInstructors.xml", &commonDOM)) return QByteArray(); QDomNode listNode = commonDOM.namedItem("ListInstructors"); @@ -34,7 +34,7 @@ QByteArray DBAnswerParser::listInstructors(bool result, QList *listI instructorNode.toElement().setAttribute("logged_in", instructor.getLoggedIn()); } - dataParser->saveDOMtoXML("ListInstructors.xml", &commonDOM); + Tools::saveDOMtoXML("ListInstructors.xml", &commonDOM); return commonDOM.toByteArray(); } @@ -42,7 +42,7 @@ QByteArray DBAnswerParser::listInstructors(bool result, QList *listI QByteArray DBAnswerParser::listGroups(bool result, QList *listGroups) { QDomDocument commonDOM; - if(! dataParser->loadXMLtoDOM(":/resources/blankXML/ListGroups.xml", &commonDOM)) + if(! Tools::loadXMLtoDOM(":/resources/blankXML/ListGroups.xml", &commonDOM)) return QByteArray(); QDomNode listNode = commonDOM.namedItem("ListGroups"); @@ -56,7 +56,7 @@ QByteArray DBAnswerParser::listGroups(bool result, QList *listGroups) groupNode.toElement().setAttribute("name", group.getName()); } - dataParser->saveDOMtoXML("ListGroups.xml", &commonDOM); + Tools::saveDOMtoXML("ListGroups.xml", &commonDOM); return commonDOM.toByteArray(); } @@ -64,7 +64,7 @@ QByteArray DBAnswerParser::listGroups(bool result, QList *listGroups) QByteArray DBAnswerParser::listTrainees(bool result, QList *listTrainees) { QDomDocument commonDOM; - if(! dataParser->loadXMLtoDOM(":/resources/blankXML/ListTrainees.xml", &commonDOM)) + if(! Tools::loadXMLtoDOM(":/resources/blankXML/ListTrainees.xml", &commonDOM)) return QByteArray(); QDomNode listNode = commonDOM.namedItem("ListTrainees"); @@ -95,7 +95,7 @@ QByteArray DBAnswerParser::listTrainees(bool result, QList *listTrainee timingNode.toElement().setAttribute("operatingTime", timing.getOperatingTimeS()); } - dataParser->saveDOMtoXML("ListTrainees.xml", &commonDOM); + Tools::saveDOMtoXML("ListTrainees.xml", &commonDOM); return commonDOM.toByteArray(); } @@ -142,7 +142,7 @@ QByteArray DBAnswerParser::listContacts(bool result, QList *listCo QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList *listTasks, int trainee_id, bool full_list) { QDomDocument commonDOM; - if(! dataParser->loadXMLtoDOM(":/resources/blankXML/ListTasksAMM.xml", &commonDOM)) + if(! Tools::loadXMLtoDOM(":/resources/blankXML/ListTasksAMM.xml", &commonDOM)) return QByteArray(); QDomNode listNode = commonDOM.namedItem("ListTasksAMM"); @@ -163,7 +163,7 @@ QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList taskNode.toElement().setAttribute("status", task.status); } - dataParser->saveDOMtoXML("ListTasksAMM.xml", &commonDOM); + Tools::saveDOMtoXML("ListTasksAMM.xml", &commonDOM); return commonDOM.toByteArray(); } @@ -171,7 +171,7 @@ QByteArray DBAnswerParser::listTasksAMMofTrainee(bool result, QList QByteArray DBAnswerParser::listTasksFIMofTrainee(bool result, QList *listTasks, int trainee_id, bool full_list) { QDomDocument commonDOM; - if(! dataParser->loadXMLtoDOM(":/resources/blankXML/ListTasksFIM.xml", &commonDOM)) + if(! Tools::loadXMLtoDOM(":/resources/blankXML/ListTasksFIM.xml", &commonDOM)) return QByteArray(); QDomNode listNode = commonDOM.namedItem("ListTasksFIM"); @@ -233,7 +233,7 @@ QByteArray DBAnswerParser::listTasksFIMofTrainee(bool result, QList } } - dataParser->saveDOMtoXML("ListTasksFIM.xml", &commonDOM); + Tools::saveDOMtoXML("ListTasksFIM.xml", &commonDOM); return commonDOM.toByteArray(); } diff --git a/ServerLMS/Systems/docsupdater.cpp b/ServerLMS/Systems/docsupdater.cpp index ba23e0a..ce8d83a 100644 --- a/ServerLMS/Systems/docsupdater.cpp +++ b/ServerLMS/Systems/docsupdater.cpp @@ -16,7 +16,7 @@ bool DocsUpdater::update() QString pathDocsFile = updateController->getPathAdditionalFile(nameDocsFile); QDomDocument docTasksDOM; - if(! DataParser::loadXMLtoDOM(pathDocsFile, &docTasksDOM)) + if(! Tools::loadXMLtoDOM(pathDocsFile, &docTasksDOM)) return false; QDomElement manifestElement = docTasksDOM.firstChildElement("manifest"); @@ -28,7 +28,7 @@ bool DocsUpdater::update() domElementParserAMM(manifestElement, nullptr); - if(! DataParser::saveDOMtoXML(pathDocsFile, &docTasksDOM)) + if(! Tools::saveDOMtoXML(pathDocsFile, &docTasksDOM)) return false; return true; @@ -229,7 +229,7 @@ QString DocsUpdater::defineCanplayByScenXML(QString dmCode) QString pathScenXMLFile = updateController->getPathScensFile(nameScenXMLFile); QDomDocument docScenDOM; - if(! DataParser::loadXMLtoDOM(pathScenXMLFile, &docScenDOM)) + if(! Tools::loadXMLtoDOM(pathScenXMLFile, &docScenDOM)) return canplay; QDomElement scenarioElement = docScenDOM.firstChildElement("scenario"); diff --git a/ServerLMS/Systems/tools.cpp b/ServerLMS/Systems/tools.cpp index acaa03b..46170d8 100644 --- a/ServerLMS/Systems/tools.cpp +++ b/ServerLMS/Systems/tools.cpp @@ -104,3 +104,37 @@ bool Tools::checkNonStaticData(QString path) return false; } + + + +bool Tools::loadXMLtoDOM(QString nameFile, QDomDocument *commonDOM) +{ + QFile xmlInFile(nameFile); + + if (! xmlInFile.open(QFile::ReadOnly | QFile::Text)) { + qDebug() << "loadXMLtoDOM: Couldn't read the file: " + nameFile; + return false; + } + + commonDOM->setContent(xmlInFile.readAll()); + xmlInFile.close(); + + return true; +} + +bool Tools::saveDOMtoXML(QString nameFile, QDomDocument *commonDOM) +{ + QFile xmlOutFile(nameFile); + if (!xmlOutFile.open(QFile::WriteOnly | QFile::Text)) + { + qDebug() << "saveDOMtoXML: Failed to write a file: " + nameFile; + return false; + } + else + { + QTextStream outFile(&xmlOutFile); + commonDOM->save(outFile, 4); + xmlOutFile.close(); + } + return true; +} diff --git a/ServerLMS/Systems/tools.h b/ServerLMS/Systems/tools.h index 90769ef..a9d7d4a 100644 --- a/ServerLMS/Systems/tools.h +++ b/ServerLMS/Systems/tools.h @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -73,6 +74,9 @@ public: static QString createVersionHashFilepath(QString fileName); static QString createFullPath(QString path); static bool checkNonStaticData(QString path); + + static bool loadXMLtoDOM(QString nameFile, QDomDocument* commonDOM); + static bool saveDOMtoXML(QString nameFile, QDomDocument* commonDOM); };