From 02a9fd6e493ee913d9431b7942e96894688cceb7 Mon Sep 17 00:00:00 2001 From: Eric Menezes Noronha Date: Fri, 2 May 2014 18:08:07 -0300 Subject: [PATCH] -Incrementando forçar coleta. --- MapaTesteProj/MapaCACIC.identcache | Bin 1327 -> 0 bytes MapaTesteProj/MapaTeste.dcu | Bin 30033 -> 0 bytes MapaTesteProj/MapaTeste.dfm | 2 +- cacicservice/cacicservice.dproj | 2 +- cacicservice/cacicservice.res | Bin 5292 -> 0 bytes gercols/gercols.dpr | 3 +++ installcacic/installcacic.dproj | 2 +- installcacic/installcacic.res | Bin 3304 -> 0 bytes installcacic/uInstallCACIC.pas | 2 -- main.pas | 11 +++-------- 10 files changed, 9 insertions(+), 13 deletions(-) diff --git a/MapaTesteProj/MapaCACIC.identcache b/MapaTesteProj/MapaCACIC.identcache index 7c0e401..9131734 100644 Binary files a/MapaTesteProj/MapaCACIC.identcache and b/MapaTesteProj/MapaCACIC.identcache differ diff --git a/MapaTesteProj/MapaTeste.dcu b/MapaTesteProj/MapaTeste.dcu index 9326566..0c68207 100644 Binary files a/MapaTesteProj/MapaTeste.dcu and b/MapaTesteProj/MapaTeste.dcu differ diff --git a/MapaTesteProj/MapaTeste.dfm b/MapaTesteProj/MapaTeste.dfm index 1a7be6f..aa7b421 100644 --- a/MapaTesteProj/MapaTeste.dfm +++ b/MapaTesteProj/MapaTeste.dfm @@ -1,7 +1,7 @@ object frmMapaCacic: TfrmMapaCacic Left = 274 Top = 200 - Caption = 'Mapa Cacic PGFN' + Caption = 'Mapa Cacic' ClientHeight = 448 ClientWidth = 789 Color = clBtnFace diff --git a/cacicservice/cacicservice.dproj b/cacicservice/cacicservice.dproj index e799b33..8993814 100644 --- a/cacicservice/cacicservice.dproj +++ b/cacicservice/cacicservice.dproj @@ -37,7 +37,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseE:\NTService\TrueFalse2814FalseFalseFalseFalseFalse10461252Dataprev - Emp. de TI da Prev Social - URES/SESSSistema CACIC - Módulo para Sustentação do Agente Principal2.8.1.43.0Licença: GNU/LGPLcacicservice.dpr +FalseTrueFalseE:\NTService\TrueFalse2815FalseFalseFalseFalseFalse10461252Dataprev - Emp. de TI da Prev Social - URES/SESSSistema CACIC - Módulo para Sustentação do Agente Principal2.8.1.53.0Licença: GNU/LGPLcacicservice.dpr diff --git a/cacicservice/cacicservice.res b/cacicservice/cacicservice.res index e89434c..91a91e1 100755 Binary files a/cacicservice/cacicservice.res and b/cacicservice/cacicservice.res differ diff --git a/gercols/gercols.dpr b/gercols/gercols.dpr index 6ac8029..51bb591 100644 --- a/gercols/gercols.dpr +++ b/gercols/gercols.dpr @@ -243,6 +243,9 @@ Begin Begin objCacic.setBoolCipher(not objCacic.isInDebugMode); objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); + objCacic.setValueToFile('Configs','forca_coleta', + objCacic.getValueFromTags('forca_coleta', strRetorno), + strGerColsInfFileName); if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then Begin objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName); diff --git a/installcacic/installcacic.dproj b/installcacic/installcacic.dproj index 91215e9..fb871da 100644 --- a/installcacic/installcacic.dproj +++ b/installcacic/installcacic.dproj @@ -32,7 +32,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseTrueFalse2814FalseFalseFalseFalseFalse10461252Dataprev - Emp. de TI da Prev Social - URES/SESSSistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC2.8.1.43.0Licença: GNU/LGPLinstallcacic.dpr +FalseTrueFalseTrueFalse2815FalseFalseFalseFalseFalse10461252Dataprev - Emp. de TI da Prev Social - URES/SESSSistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC2.8.1.53.0Licença: GNU/LGPLinstallcacic.dpr diff --git a/installcacic/installcacic.res b/installcacic/installcacic.res index 7cf1040..1689657 100644 Binary files a/installcacic/installcacic.res and b/installcacic/installcacic.res differ diff --git a/installcacic/uInstallCACIC.pas b/installcacic/uInstallCACIC.pas index b2c6161..e71814c 100644 --- a/installcacic/uInstallCACIC.pas +++ b/installcacic/uInstallCACIC.pas @@ -797,8 +797,6 @@ begin else objCacic.writeDebugLog('installCACIC: Problema no Download do Verificador de Integridade do Sistema (ChkSIS)'); End; - // EXECUTA MAPACACIC SEMPRE. - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',true,SW_SHOW); Except on E : Exception do Begin diff --git a/main.pas b/main.pas index 6855379..bbbc94d 100755 --- a/main.pas +++ b/main.pas @@ -273,10 +273,6 @@ type procedure Finaliza(boolNormal : boolean = true); // procedure MontaVetoresPatrimonio(p_strConfigs : String); procedure Invoca_GerCols(p_acao:string; boolShowInfo : Boolean = true; boolCheckExecution : Boolean = false); - -//////////////////////////////////////////////////////////////////////////////// -// PRÓXIMO PROCEDURE CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // -//////////////////////////////////////////////////////////////////////////////// procedure Invoca_MapaCacic; procedure CheckIfDownloadedVersion; procedure WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND; @@ -972,8 +968,6 @@ begin g_intStatusAnterior := -1; // Aplicar traduções GetText,etc... - // - // strMenuCaptionLAT := Mnu_LogAtividades.Caption; strMenuCaptionCON := Mnu_Configuracoes.Caption; @@ -1288,7 +1282,8 @@ begin if FindCmdLineSwitch('execute', True) or FindCmdLineSwitch('atualizacao', True) or Pode_Coletar or - (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') Then + (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') or + (trim(objCACIC.getValueFromFile('Configs','ForcaColeta', strGerColsInfFileName))='S') Then Begin //////////////////////////////////////////////////////////////////////////////// // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // @@ -1298,7 +1293,7 @@ begin objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...'); Invoca_MapaCacic; end; - + timerCheckNoMinuto.Enabled := false; objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...'); -- libgit2 0.21.2