From 6bccc883d82a8d5948d6c6f63419ec77b4b74e23 Mon Sep 17 00:00:00 2001
From: Thiago Rocha <thiroc80@gmail.com>
Date: Fri, 19 Sep 2014 11:36:51 -0300
Subject: [PATCH] Envio do json gerado pelo Gercols, e alteração do path de getTest() e getConfig().

---
 cacic-daemon/cacicD/cacictimer.cpp |  9 +++++++--
 cacic-daemon/cacicD/cacictimer.h   |  5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cacic-daemon/cacicD/cacictimer.cpp b/cacic-daemon/cacicD/cacictimer.cpp
index bfee564..86bedfb 100644
--- a/cacic-daemon/cacicD/cacictimer.cpp
+++ b/cacic-daemon/cacicD/cacictimer.cpp
@@ -47,6 +47,11 @@ void CacicTimer::mslot(){
                     if( nome == "gercols" ) {
                         definirDirGercols(getApplicationDirPath());
                         iniciarModulo();
+
+                        //Envio do json gerado na coleta
+                        bool ok;
+                        QJsonObject jsonColeta = ccacic->getJsonFromFile("coleta.json");
+                        OCacicComm->comm("/ws/neo/coleta", &ok, jsonColeta );
                     } else if( nome == "mapas" ) {
                         definirDirMapas(getApplicationDirPath());
                         iniciarModulo();
@@ -75,7 +80,7 @@ bool CacicTimer::getTest(){
         bool ok;
         QJsonObject as;
         as["computador"] = OCacic_Computer.toJsonObject();
-        QJsonObject jsonresult = OCacicComm->comm("/ws/neo/login", &ok, as);
+        QJsonObject jsonresult = OCacicComm->comm("/ws/neo/test", &ok, as);
         //        if(jsonresult.contains("error")){
         //            return false;
         //        }
@@ -97,7 +102,7 @@ bool CacicTimer::getConfig(){
         bool ok;
         QJsonObject as;
         as["computador"] = OCacic_Computer.toJsonObject();
-        QJsonObject jsonresult = OCacicComm->comm("/ws/neo/login", &ok, as);
+        QJsonObject jsonresult = OCacicComm->comm("/ws/neo/config", &ok, as);
         //        if(jsonresult.contains("error")){
         //            return false;
         //        }
diff --git a/cacic-daemon/cacicD/cacictimer.h b/cacic-daemon/cacicD/cacictimer.h
index b2f48c8..1ba3c02 100644
--- a/cacic-daemon/cacicD/cacictimer.h
+++ b/cacic-daemon/cacicD/cacictimer.h
@@ -36,17 +36,18 @@ public:
 private:
     void registraFimColeta(QString msg);
     void registraInicioColeta();
-    void verificarModulos();
+    QStringList verificarModulos();
     void reiniciarTimer();
     QLogger::QLoggerManager *logManager;
     QString dirProgram;
     QString applicationDirPath;
     QString getDirProgram() const;
-    void iniciarGercols();
+    void iniciarModulo();
     void iniciarInstancias();
     void verificarPeriodicidadeJson();
     void lerArquivoConfig( const QJsonObject &jsonConfig);
     void definirDirGercols(QString appDirPath);
+    void definirDirMapas(QString appDirPath);
     QJsonObject jsonConfig;
     int periodicidadeExecucao;
     int getPeriodicidadeExecucao() const;
--
libgit2 0.21.2