Download as
Browse Code »

Commit 02a9fd6e493ee913d9431b7942e96894688cceb7

Authored by Eric Menezes Noronha
1 parent 07eeb6ed
Exists in master

-Incrementando forçar coleta.

Showing 10 changed files with 9 additions and 13 deletions   Show diff stats
MapaTesteProj/MapaCACIC.identcache
View file @02a9fd6
No preview for this file type
MapaTesteProj/MapaTeste.dcu
View file @02a9fd6
No preview for this file type
MapaTesteProj/MapaTeste.dfm
  Diff comments   View file @02a9fd6
1 object frmMapaCacic: TfrmMapaCacic 1 object frmMapaCacic: TfrmMapaCacic
2 Left = 274 2 Left = 274
3 Top = 200 3 Top = 200
4 - Caption = 'Mapa Cacic PGFN' 4 + Caption = 'Mapa Cacic'
5 ClientHeight = 448 5 ClientHeight = 448
6 ClientWidth = 789 6 ClientWidth = 789
7 Color = clBtnFace 7 Color = clBtnFace
cacicservice/cacicservice.dproj
  Diff comments   View file @02a9fd6
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <Borland.Personality>Delphi.Personality</Borland.Personality> 37 <Borland.Personality>Delphi.Personality</Borland.Personality>
38 <Borland.ProjectType>VCLApplication</Borland.ProjectType> 38 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
39 <BorlandProject> 39 <BorlandProject>
40 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">4</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Sustentação do Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.4</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacicservice.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 40 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Sustentação do Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacicservice.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
41 </ProjectExtensions> 41 </ProjectExtensions>
42 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 42 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
43 <ItemGroup> 43 <ItemGroup>
cacicservice/cacicservice.res
View file @02a9fd6
No preview for this file type
gercols/gercols.dpr
  Diff comments   View file @02a9fd6
@@ -243,6 +243,9 @@ Begin @@ -243,6 +243,9 @@ Begin
243 Begin 243 Begin
244 objCacic.setBoolCipher(not objCacic.isInDebugMode); 244 objCacic.setBoolCipher(not objCacic.isInDebugMode);
245 objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); 245 objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName);
  246 + objCacic.setValueToFile('Configs','forca_coleta',
  247 + objCacic.getValueFromTags('forca_coleta', strRetorno),
  248 + strGerColsInfFileName);
246 if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then 249 if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then
247 Begin 250 Begin
248 objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName); 251 objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName);
installcacic/installcacic.dproj
  Diff comments   View file @02a9fd6
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <Borland.Personality>Delphi.Personality</Borland.Personality> 32 <Borland.Personality>Delphi.Personality</Borland.Personality>
33 <Borland.ProjectType>VCLApplication</Borland.ProjectType> 33 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
34 <BorlandProject> 34 <BorlandProject>
35 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">4</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.4</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">installcacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 35 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">installcacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
36 </ProjectExtensions> 36 </ProjectExtensions>
37 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 37 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
38 <ItemGroup> 38 <ItemGroup>
installcacic/installcacic.res
View file @02a9fd6
No preview for this file type
installcacic/uInstallCACIC.pas
  Diff comments   View file @02a9fd6
@@ -797,8 +797,6 @@ begin @@ -797,8 +797,6 @@ begin
797 else 797 else
798 objCacic.writeDebugLog('installCACIC: Problema no Download do Verificador de Integridade do Sistema (ChkSIS)'); 798 objCacic.writeDebugLog('installCACIC: Problema no Download do Verificador de Integridade do Sistema (ChkSIS)');
799 End; 799 End;
800 - // EXECUTA MAPACACIC SEMPRE.  
801 - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',true,SW_SHOW);  
802 Except 800 Except
803 on E : Exception do 801 on E : Exception do
804 Begin 802 Begin
@@ -273,10 +273,6 @@ type @@ -273,10 +273,6 @@ type
273 procedure Finaliza(boolNormal : boolean = true); 273 procedure Finaliza(boolNormal : boolean = true);
274 // procedure MontaVetoresPatrimonio(p_strConfigs : String); 274 // procedure MontaVetoresPatrimonio(p_strConfigs : String);
275 procedure Invoca_GerCols(p_acao:string; boolShowInfo : Boolean = true; boolCheckExecution : Boolean = false); 275 procedure Invoca_GerCols(p_acao:string; boolShowInfo : Boolean = true; boolCheckExecution : Boolean = false);
276 -  
277 -////////////////////////////////////////////////////////////////////////////////  
278 -// PRÓXIMO PROCEDURE CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //  
279 -////////////////////////////////////////////////////////////////////////////////  
280 procedure Invoca_MapaCacic; 276 procedure Invoca_MapaCacic;
281 procedure CheckIfDownloadedVersion; 277 procedure CheckIfDownloadedVersion;
282 procedure WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND; 278 procedure WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND;
@@ -972,8 +968,6 @@ begin @@ -972,8 +968,6 @@ begin
972 g_intStatusAnterior := -1; 968 g_intStatusAnterior := -1;
973 969
974 // Aplicar traduções GetText,etc... 970 // Aplicar traduções GetText,etc...
975 - //  
976 - //  
977 971
978 strMenuCaptionLAT := Mnu_LogAtividades.Caption; 972 strMenuCaptionLAT := Mnu_LogAtividades.Caption;
979 strMenuCaptionCON := Mnu_Configuracoes.Caption; 973 strMenuCaptionCON := Mnu_Configuracoes.Caption;
@@ -1288,7 +1282,8 @@ begin @@ -1288,7 +1282,8 @@ begin
1288 if FindCmdLineSwitch('execute', True) or 1282 if FindCmdLineSwitch('execute', True) or
1289 FindCmdLineSwitch('atualizacao', True) or 1283 FindCmdLineSwitch('atualizacao', True) or
1290 Pode_Coletar or 1284 Pode_Coletar or
1291 - (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') Then 1285 + (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') or
  1286 + (trim(objCACIC.getValueFromFile('Configs','ForcaColeta', strGerColsInfFileName))='S') Then
1292 Begin 1287 Begin
1293 //////////////////////////////////////////////////////////////////////////////// 1288 ////////////////////////////////////////////////////////////////////////////////
1294 // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // 1289 // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
@@ -1298,7 +1293,7 @@ begin @@ -1298,7 +1293,7 @@ begin
1298 objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...'); 1293 objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
1299 Invoca_MapaCacic; 1294 Invoca_MapaCacic;
1300 end; 1295 end;
1301 - 1296 +
1302 timerCheckNoMinuto.Enabled := false; 1297 timerCheckNoMinuto.Enabled := false;
1303 objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...'); 1298 objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...');
1304 1299