Merge branch 'bugfix-version-info' into merge-task-and-verController

This commit is contained in:
semenov
2025-01-22 17:33:12 +03:00
17 changed files with 144 additions and 58 deletions

View File

@@ -59,6 +59,10 @@ void ProcessParser::read(ClientHandler *client, QByteArray array)
clientNotify(xmlReader,client);
}
else if(xmlReader.name() == "DataInfo")
{
clientDataInfo(xmlReader,client);
}
else
{
emit sigLogMessage("XmlParser: unrecognized tag");
@@ -69,6 +73,25 @@ void ProcessParser::read(ClientHandler *client, QByteArray array)
}//while(!xmlReader.atEnd())
}
void ProcessParser::clientDataInfo(QXmlStreamReader &xmlReader,ClientHandler *client)
{
DataInfo *dataInfo = new DataInfo;
foreach(const QXmlStreamAttribute &attr, xmlReader.attributes())
{
QString name = attr.name().toString();
QString value = attr.value().toString();
if(name == "path")
dataInfo->path= value.toUtf8();
if(name == "size")
dataInfo->size = value.toLong();
}
processingSystem->setCurrentDataInfo(dataInfo);
}
void ProcessParser::clientAuth(QXmlStreamReader &xmlReader,ClientHandler *client)
{
ClientAutorization clientAutorization;

View File

@@ -2,9 +2,9 @@
#define PROCESSPARSER_H
#include <QObject>
#include <Data/typesDataServerClient.h>
#include <qxmlstream.h>
#include <clienthandler.h>
#include "Data/typesDataServerClient.h"
class ProcessParser : public QObject
{
@@ -26,6 +26,7 @@ private:
void queryTasksXML(QXmlStreamReader &xmlReader,ClientHandler *client);
void clientMessage(QXmlStreamReader &xmlReader,ClientHandler *client);
void clientNotify(QXmlStreamReader &xmlReader,ClientHandler *client);
void clientDataInfo(QXmlStreamReader &xmlReader, ClientHandler *client);
};
#endif // PROCESSPARSER_H