signal_updateDocsXML

LibServer/Systems/docsupdater.cpp

@@ -37,8 +37,10 @@ QList<SubProc> DocsUpdater::getListSubProcForDMcode(QString dmCode)
     return listSubProcMap.value(dmCode);
 }
 
-bool DocsUpdater::updateDocsXML()
+bool DocsUpdater::slot_updateDocsXML()
 {
+    qDebug() << "DocsUpdater::updateDocsXML thread ID " << QThread::currentThreadId();
+
     QMutexLocker locker(&mtxAccess);
 
     QString pathDocsFile = updateController->getPathAdditionalFile(tasksAMMfileName);
@@ -97,6 +99,7 @@ bool DocsUpdater::updateDocsXML()
         }
     }
 
+    emit signal_DocsChanged();
     return true;
 }
 

LibServer/Systems/docsupdater.h

@@ -16,9 +16,10 @@ public:
     void lockAccessToDocsXML();
     void unLockAccessToDocsXML();
 
-    QList<SubProc> getListSubProcForDMcode(QString dmCode);    
+    QList<SubProc> getListSubProcForDMcode(QString dmCode);
 
-    bool updateDocsXML();
+public slots:
+    bool slot_updateDocsXML();
 
 private:
     void domElementParserAMM(QDomElement element, Module* moduleParent);
@@ -27,6 +28,9 @@ private:
     void selectSubProc(QDomElement& modeElement, QList<SubProc>& listSubProc);
     DM* getDMmoduleByDMcode(QString dmCode);
 
+signals:
+    void signal_DocsChanged();
+
 private:
     UpdateController* updateController;
 

LibServer/serverlmswidget.cpp

@@ -147,12 +147,14 @@ void ServerLMSWidget::slot_ErrorPostgreSQL(QString text)
 
 void ServerLMSWidget::slot_UpdateDocs()
 {
-    QApplication::setOverrideCursor(Qt::WaitCursor);
+    //QApplication::setOverrideCursor(Qt::WaitCursor);
 
-    if(docsUpdater->updateDocsXML())
-        emit signal_DocsChanged();
+    emit signal_updateDocsXML();
 
-    QApplication::restoreOverrideCursor();
+    //if(docsUpdater->slot_updateDocsXML())
+        //emit signal_DocsChanged();
+
+    //QApplication::restoreOverrideCursor();
 
     //TODO для теста
     //cfiController->test();
@@ -387,7 +389,8 @@ void ServerLMSWidget::startInitialization_step0()
     dataParser = new DataParser(assetsManager, processingSystem);
 
     commonClientHandler = new CommonClientHandler;
-    connect(this, &ServerLMSWidget::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
+    //connect(this, &ServerLMSWidget::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
+    connect(docsUpdater, &DocsUpdater::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
     //connect(commonClientHandler, &CommonClientHandler::sigSetServerState, this, &ServerLMSWidget::slot_trySetServerState);
 
     server = new MultiThreadServer(this, updateController, processingSystem, dataParser, 6000);
@@ -416,6 +419,8 @@ void ServerLMSWidget::startInitialization_step0()
 
     connect(assetsManager, &AssetsManager::signal_setVersion, this, &ServerLMSWidget::slot_setVersion);
 
+    connect(this, &ServerLMSWidget::signal_updateDocsXML, docsUpdater, &DocsUpdater::slot_updateDocsXML);
+
     emit sigUpdateControllerInitialize(commonClientHandler, dataParser, assetsManager);
 }
 

LibServer/serverlmswidget.h

@@ -86,11 +86,12 @@ signals:
     void sigCalculateFullHash();
     void sigUpdateControllerInitialize(CommonClientHandler* commonClientHandler,DataParser *dataParser,AssetsManager *assetManager);
 
-    void signal_DocsChanged();
+    //void signal_DocsChanged();
     void signal_hasError(int code);
 
     void signal_updateStateServer(EStateServer stateServer, EStateBlockAutorization stateBlockAutorization);
 
+    void signal_updateDocsXML();
 public slots:
     void slot_LanguageChanged(QString language);
     void slot_UpdateListClients();