From a8c7a0f662098c870112474ff7f4972d08a89dd3 Mon Sep 17 00:00:00 2001
From: Thiago Rocha <thiroc80@gmail.com>
Date: Fri, 19 Sep 2014 10:52:45 -0300
Subject: [PATCH] Pequenas coisas para adaptar depois ao json do getConfig() na coleta.

---
 cacic-daemon/cacicD/cacictimer.cpp |  2 +-
 gercols/gercols.cpp                |  5 +++++
 src/ccoleta.cpp                    | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/cacic-daemon/cacicD/cacictimer.cpp b/cacic-daemon/cacicD/cacictimer.cpp
index f1e0eaa..b1c494e 100644
--- a/cacic-daemon/cacicD/cacictimer.cpp
+++ b/cacic-daemon/cacicD/cacictimer.cpp
@@ -257,7 +257,7 @@ void CacicTimer::verificarModulos(){
     }
     delete fileOld;
     delete fileNew;
-    lerArquivoConfig(jsonConfig);
+    lerArquivoConfig(jsonConfig["agentcomputer"].toObject());
     int countExecNotFound = 0;
     QMap<QString, QString>::const_iterator mapIterator = moduleMap.constBegin();
     while (mapIterator != moduleMap.constEnd()) {
diff --git a/gercols/gercols.cpp b/gercols/gercols.cpp
index ee57482..5f3209e 100644
--- a/gercols/gercols.cpp
+++ b/gercols/gercols.cpp
@@ -16,6 +16,7 @@ Gercols::Gercols(QObject *parent)
 
     oCacic.setJsonToFile(configTeste,"configReq.json");
     /*************************************************************************/
+
     oColeta = new CColeta;
     //Pega chave do registro, que será pega na instalação.
     oCacic.setChaveCrypt(oCacic.getValueFromRegistry("Lightbase", "Cacic", "key").toString());
@@ -32,7 +33,11 @@ void Gercols::run()
     //emite sinal para começar a coleta
     emit iniciaColeta();
 
+    /* Json de teste sendo excluído
+     */
     oCacic.deleteFile("configReq.json");
+    /***********************************/
+
     oColeta->waitToCollect();
     //salva json em arquivo
     if (!oColeta->toJsonObject().isEmpty())
diff --git a/src/ccoleta.cpp b/src/ccoleta.cpp
index d79fa00..a715942 100644
--- a/src/ccoleta.cpp
+++ b/src/ccoleta.cpp
@@ -42,6 +42,7 @@ bool CColeta::waitToCollect()
 
 void CColeta::run()
 {
+    /* Versão do json de testes */
     QJsonObject coleta = oCacic.getJsonFromFile("configReq.json");
 
     if( coleta.contains("hardware") ){
@@ -54,6 +55,27 @@ void CColeta::run()
         emit beginSoftware();
     } else
         this->softwareIsFinish = true;
+    /************************************************************/
+
+
+    /* Versão do json definitiva, obtiva através do getConfig()
+    QJsonObject coleta = oCacic.getJsonFromFile("getConfig.json")["agentcomputer"].toObject();
+
+    foreach ( QJsonValue action, coleta["actions"].toArray() ){
+        QJsonObject jsonAction = action.toObject();
+
+        if( jsonAction.contains("col_hard") && jsonAction["col_hard"] == QJsonValue.fromVariant(QString("true")) ){
+            this->hardwareIsFinish = false;
+            emit beginHardware();
+        } else
+            this->hardwareIsFinish = true;
+        if ( jsonAction.contains("col_soft") && jsonAction["col_soft"] == QJsonValue.fromVariant(QString("true")) ){
+            this->softwareIsFinish = false;
+            emit beginSoftware();
+        } else
+            this->softwareIsFinish = true;
+    }
+    /************************************************************/
 
 }
 
--
libgit2 0.21.2