Download as
Browse Code »

Commit 8b7a1cc6544677aaba257798f9a9a039c774c585

Authored by Eric Menezes Noronha
1 parent 2d78db14
Exists in master

2.8.1.18: Alteração da verificação de conexão quando falha. O agente fazia uma n… 

…ova tentativa de 1 em 1 minuto. Foi alterado para o tempo de checagem de coleta forçada.
Showing 17 changed files with 27 additions and 29 deletions   Show diff stats
@@ -445,16 +445,20 @@ object frmMapaCacic: TfrmMapaCacic @@ -445,16 +445,20 @@ object frmMapaCacic: TfrmMapaCacic
445 TabOrder = 9 445 TabOrder = 9
446 object rdConcordaTermos: TRadioButton 446 object rdConcordaTermos: TRadioButton
447 Left = 3 447 Left = 3
448 - Top = 23  
449 - Width = 742  
450 - Height = 57 448 + Top = 16
  449 + Width = 758
  450 + Height = 64
451 BiDiMode = bdLeftToRight 451 BiDiMode = bdLeftToRight
452 Caption = 452 Caption =
453 'Declaro minha responsabilidade pelas informa'#231#245'es prestadas e que' + 453 'Declaro minha responsabilidade pelas informa'#231#245'es prestadas e que' +
454 - ' tenho pleno conhecimento das orienta'#231#245'es contidas no Memorando-' +  
455 - 'Circular N'#186' 116/2014/PGFN/DGC/CGA-CTI, sobre o armazenamento seg' +  
456 - 'uro de dados no ambiente computacional da PGFN.' 454 + ' tenho pleno conhecimento das orienta'#231#245'es repassadas.'
  455 + Font.Charset = DEFAULT_CHARSET
  456 + Font.Color = clBlue
  457 + Font.Height = -11
  458 + Font.Name = 'MS Sans Serif'
  459 + Font.Style = [fsBold]
457 ParentBiDiMode = False 460 ParentBiDiMode = False
  461 + ParentFont = False
458 TabOrder = 0 462 TabOrder = 0
459 WordWrap = True 463 WordWrap = True
460 OnClick = rdConcordaTermosClick 464 OnClick = rdConcordaTermosClick
@@ -699,9 +699,7 @@ begin @@ -699,9 +699,7 @@ begin
699 else 699 else
700 Begin 700 Begin
701 frmMapaCacic.boolAcessoOK := false; 701 frmMapaCacic.boolAcessoOK := false;
702 - Application.messagebox(Pchar('Atenção! É necessário reinstalar o CACIC nesta estação.' +  
703 - #13#10 + #13#10 + 'A estrutura encontra-se corrompida.'),  
704 - 'Erro!',MB_ICONERROR + mb_ok); 702 + objCACIC.writeDailyLog('Atenção! É necessário reinstalar o CACIC nesta estação. A estrutura encontra-se corrompida.');
705 Finalizar; 703 Finalizar;
706 End; 704 End;
707 end 705 end
Mapa/Source/synsock.pas
  Diff comments   View file @8b7a1cc
@@ -53,7 +53,7 @@ unit synsock; @@ -53,7 +53,7 @@ unit synsock;
53 {$ENDIF} 53 {$ENDIF}
54 54
55 {$IFDEF WIN32} 55 {$IFDEF WIN32}
56 - {$I sswin32.inc} 56 + {$I sswin32q.inc}
57 {$ELSE} 57 {$ELSE}
58 {$IFDEF FPC} 58 {$IFDEF FPC}
59 {$I ssfpc.pas} 59 {$I ssfpc.pas}
Mapa/mapacacic.dproj
  Diff comments   View file @8b7a1cc
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <Borland.Personality>Delphi.Personality</Borland.Personality> 24 <Borland.Personality>Delphi.Personality</Borland.Personality>
25 <Borland.ProjectType /> 25 <Borland.ProjectType />
26 <BorlandProject> 26 <BorlandProject>
27 -<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">17</VersionInfo><VersionInfo Name="Debug">True</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.17</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">mapacacic.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> 27 +<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">18</VersionInfo><VersionInfo Name="Debug">True</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.18</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">mapacacic.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
28 </ProjectExtensions> 28 </ProjectExtensions>
29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
30 <ItemGroup> 30 <ItemGroup>
Mapa/mapacacic.res
View file @8b7a1cc
No preview for this file type
cacic280.dproj
  Diff comments   View file @8b7a1cc
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <Borland.Personality>Delphi.Personality</Borland.Personality> 40 <Borland.Personality>Delphi.Personality</Borland.Personality>
41 <Borland.ProjectType>VCLApplication</Borland.ProjectType> 41 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
42 <BorlandProject> 42 <BorlandProject>
43 -<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">17</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 Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 43 +<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">18</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 Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.18</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright">Baseado na licença GNU/LGPL</VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Cacic - Configurador Automático e Coletor de Informações Computacionais</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">cacic280.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
44 </ProjectExtensions> 44 </ProjectExtensions>
45 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 45 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
46 <ItemGroup> 46 <ItemGroup>
cacic280.res
View file @8b7a1cc
No preview for this file type
cacicservice/cacicservice.dproj
  Diff comments   View file @8b7a1cc
@@ -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">17</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.17</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">18</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.18</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 @8b7a1cc
No preview for this file type
chksis/chksis.dproj
  Diff comments   View file @8b7a1cc
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <Borland.Personality>Delphi.Personality</Borland.Personality> 29 <Borland.Personality>Delphi.Personality</Borland.Personality>
30 <Borland.ProjectType>VCLApplication</Borland.ProjectType> 30 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
31 <BorlandProject> 31 <BorlandProject>
32 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\Arquivos de programas\Borland\Delphi7\Mitec\D7</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Arquivos de programas\Borland\Delphi7\Bin\</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">17</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 Verificador de Integridade</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">ChkSIS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">chksis.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 32 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\Arquivos de programas\Borland\Delphi7\Mitec\D7</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Arquivos de programas\Borland\Delphi7\Bin\</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">18</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 Verificador de Integridade</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.18</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">ChkSIS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">chksis.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
33 </ProjectExtensions> 33 </ProjectExtensions>
34 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 34 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
35 <ItemGroup> 35 <ItemGroup>
chksis/chksis.res
View file @8b7a1cc
No preview for this file type
gercols/gercols.dpr
  Diff comments   View file @8b7a1cc
@@ -405,7 +405,7 @@ Begin @@ -405,7 +405,7 @@ Begin
405 except 405 except
406 on E : Exception do 406 on E : Exception do
407 Begin 407 Begin
408 - objCacic.writeDebugLog('getTest: Lançando Exceção #2'); 408 + objCacic.writeDebugLog('getMapa: Lançando Exceção #2');
409 objCacic.writeExceptionLog(E.Message,E.ClassName,'Exceção #2 - Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); 409 objCacic.writeExceptionLog(E.Message,E.ClassName,'Exceção #2 - Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').');
410 objCacic.writeDailyLog('Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').'); 410 objCacic.writeDailyLog('Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').');
411 End; 411 End;
gercols/gercols.dproj
  Diff comments   View file @8b7a1cc
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <Borland.Personality>Delphi.Personality</Borland.Personality> 38 <Borland.Personality>Delphi.Personality</Borland.Personality>
39 <Borland.ProjectType>VCLApplication</Borland.ProjectType> 39 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
40 <BorlandProject> 40 <BorlandProject>
41 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</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">17</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 Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.17</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 41 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</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">18</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 Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.18</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
42 </ProjectExtensions> 42 </ProjectExtensions>
43 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 43 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
44 <ItemGroup> 44 <ItemGroup>
gercols/gercols.res
View file @8b7a1cc
No preview for this file type
installcacic/installcacic.dproj
  Diff comments   View file @8b7a1cc
@@ -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">17</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.17</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">18</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.18</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 @8b7a1cc
No preview for this file type
@@ -1123,10 +1123,9 @@ begin @@ -1123,10 +1123,9 @@ begin
1123 objCACIC.writeDebugLog('FormCreate: Opção /execute recebida...'); 1123 objCACIC.writeDebugLog('FormCreate: Opção /execute recebida...');
1124 objCACIC.writeDailyLog('Opção para execução imediata encontrada...'); 1124 objCACIC.writeDailyLog('Opção para execução imediata encontrada...');
1125 end; 1125 end;
1126 - Invoca_GerCols('getMapa');  
1127 ExecutaCACIC(nil); 1126 ExecutaCACIC(nil);
1128 end; 1127 end;
1129 - 1128 + Invoca_GerCols('getMapa');
1130 // Os timers iniciam-se desabilitados... Mais � frente receber�o par�metros de tempo para execu��o. 1129 // Os timers iniciam-se desabilitados... Mais � frente receber�o par�metros de tempo para execu��o.
1131 timerNuExecApos.Enabled := False; 1130 timerNuExecApos.Enabled := False;
1132 timerNuIntervalo.Enabled := False; 1131 timerNuIntervalo.Enabled := False;
@@ -1181,8 +1180,8 @@ Begin @@ -1181,8 +1180,8 @@ Begin
1181 // Inicializa��o do indicador de SENHA J� INFORMADA 1180 // Inicializa��o do indicador de SENHA J� INFORMADA
1182 objCACIC.setValueToFile('Configs','SJI',objCACIC.enCrypt(''),strMainProgramInfFileName); 1181 objCACIC.setValueToFile('Configs','SJI',objCACIC.enCrypt(''),strMainProgramInfFileName);
1183 1182
1184 - if (Trim(objCACIC.GetValueFromFile('Configs','InExibeBandeja' ,strMainProgramInfFileName)) = '') or  
1185 - ((Trim(objCACIC.GetValueFromFile('Configs','InExibeBandeja' ,strMainProgramInfFileName)) <> 'S')) then 1183 + if (Trim(objCACIC.GetValueFromFile('Configs','InExibeBandeja' ,strMainProgramInfFileName)) = '' ) or
  1184 + (Trim(objCACIC.GetValueFromFile('Configs','InExibeBandeja' ,strMainProgramInfFileName)) <> 'S') then
1186 objCACIC.setValueToFile('Configs','InExibeBandeja' , 'S' ,strMainProgramInfFileName); 1185 objCACIC.setValueToFile('Configs','InExibeBandeja' , 'S' ,strMainProgramInfFileName);
1187 1186
1188 if (objCACIC.GetValueFromFile('Configs','NuExecApos' ,strMainProgramInfFileName) = '') then 1187 if (objCACIC.GetValueFromFile('Configs','NuExecApos' ,strMainProgramInfFileName) = '') then
@@ -1307,7 +1306,7 @@ begin @@ -1307,7 +1306,7 @@ begin
1307 timerNuExecApos.Enabled := False; 1306 timerNuExecApos.Enabled := False;
1308 objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"'); 1307 objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"');
1309 1308
1310 - if (p_acao = 'getTest') or (p_acao = 'getConfig') then 1309 + if (p_acao = 'getTest') or (p_acao = 'getConfig') or (p_acao = 'getMapa') then
1311 objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,true,SW_HIDE) 1310 objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,true,SW_HIDE)
1312 else 1311 else
1313 objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,false,SW_HIDE); 1312 objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + ' /MainProgramName=' + objCACIC.getMainProgramName + ' /MainProgramHash=' + objCACIC.getMainProgramHash,false,SW_HIDE);
@@ -1322,6 +1321,7 @@ end; @@ -1322,6 +1321,7 @@ end;
1322 1321
1323 procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject); 1322 procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject);
1324 begin 1323 begin
  1324 + FormularioGeral.Invoca_GerCols('getMapa');
1325 if (ActualActivity=0) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then 1325 if (ActualActivity=0) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then
1326 Invoca_MapaCacic 1326 Invoca_MapaCacic
1327 else if(ActualActivity <> 0) then 1327 else if(ActualActivity <> 0) then
@@ -2340,8 +2340,9 @@ end; @@ -2340,8 +2340,9 @@ end;
2340 procedure TFormularioGeral.CheckForcaColetaTimer(Sender: TObject); 2340 procedure TFormularioGeral.CheckForcaColetaTimer(Sender: TObject);
2341 begin 2341 begin
2342 Invoca_GerCols('getTest'); 2342 Invoca_GerCols('getTest');
2343 - if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') then  
2344 -// Invoca_GerCols('collect'); 2343 + if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') or
  2344 + (objCACIC.GetValueFromFile('Configs','ConexaoOK', strGerColsInfFileName) <> 'S') then
  2345 + objCACIC.deleteFileOrFolder(objCACIC.getLocalFolderName + 'Temp\ck_conexao.ini');
2345 FormularioGeral.ExecutaCACIC(nil); 2346 FormularioGeral.ExecutaCACIC(nil);
2346 end; 2347 end;
2347 2348
@@ -2575,11 +2576,6 @@ begin @@ -2575,11 +2576,6 @@ begin
2575 FormularioGeral.Finaliza(false) 2576 FormularioGeral.Finaliza(false)
2576 else if (FormularioGeral.ActualActivity = 0) THEN 2577 else if (FormularioGeral.ActualActivity = 0) THEN
2577 Begin 2578 Begin
2578 - if (objCACIC.GetValueFromFile('Configs','ConexaoOK', strGerColsInfFileName) <> 'S') then  
2579 - Begin  
2580 - objCACIC.deleteFileOrFolder(objCACIC.getLocalFolderName + 'Temp\ck_conexao.ini');  
2581 - FormularioGeral.ExecutaCACIC(nil);  
2582 - End;  
2583 objCACIC.writeDebugLog('timerCheckNoMinutoTimer: Verificando exist�ncia de nova vers�o de CACICservice para atualiza��o'); 2579 objCACIC.writeDebugLog('timerCheckNoMinutoTimer: Verificando exist�ncia de nova vers�o de CACICservice para atualiza��o');
2584 // Verifica��o de exist�ncia de nova vers�o do CACICservice para substitui��o e execu��o 2580 // Verifica��o de exist�ncia de nova vers�o do CACICservice para substitui��o e execu��o
2585 if FileExists(objCACIC.getLocalFolderName + 'Temp\cacicservice.exe') then 2581 if FileExists(objCACIC.getLocalFolderName + 'Temp\cacicservice.exe') then