mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-28 19:55:48 +03:00
Merge branch 'work7' into DEV
This commit is contained in:
@@ -371,7 +371,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
break;
|
||||
};
|
||||
|
||||
//xml-ответы на запросы AdditionalFiles
|
||||
//xml-ответы на запросы AdditionalFiles (сигнал о чтении ранее принятого)
|
||||
if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM ||
|
||||
packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM)
|
||||
{
|
||||
@@ -381,7 +381,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
|
||||
if(packetType == PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM)
|
||||
xmlFileName = "./" + additionalFilesFolderName + "/tasksFIM.xml";
|
||||
else
|
||||
xmlFileName = "./" + additionalFilesFolderName + "/tasksAMM.xml";
|
||||
xmlFileName = "./" + additionalFilesFolderName + "/docs.xml"; //"/tasksAMM.xml";
|
||||
|
||||
QFile xmlInFile(xmlFileName);
|
||||
if (!xmlInFile.open(QFile::ReadOnly | QFile::Text))
|
||||
|
||||
Reference in New Issue
Block a user