Commit ead2157e895408005446957ec10cdbed42bcae38

Authored by Eric Menezes Noronha
1 parent 891a3e20
Exists in master

-Gercols: Adicionado método 'getTest' para não precisar fazer toda a operação do…

… get/config para pegar apenas ele; Recebendo parâmetros de força coleta e verificação do módulo de patrimônio; Adicionado timer de 1 minuto para realizar o get/test e, se solicitado, realizar coleta.
MapaTesteProj/MapaCACIC.dproj
... ... @@ -24,7 +24,8 @@
24 24 <Borland.Personality>Delphi.Personality</Borland.Personality>
25 25 <Borland.ProjectType />
26 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">5</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.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">mapacacic.dpr</Source></Source></Delphi.Personality></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">5</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.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">mapacacic.dpr</Source></Source></Delphi.Personality> <ModelSupport>False</ModelSupport>
  28 +</BorlandProject></BorlandProject>
28 29 </ProjectExtensions>
29 30 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
30 31 <ItemGroup>
... ...
MapaTesteProj/MapaTeste.dcu
No preview for this file type
MapaTesteProj/MapaTeste.pas
... ... @@ -299,7 +299,6 @@ Begin
299 299 Result := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/config', strFieldsAndValuesToRequest, objCacic.getLocalFolderName);
300 300  
301 301 objCacic.setBoolCipher(not objCacic.isInDebugMode);
302   -
303 302 objCacic.writeDebugLog('FormActivate: Retorno de getConfigs: "'+Result+'"');
304 303  
305 304 if (Result <> '0') then
... ...
cacic280.dproj
... ... @@ -40,7 +40,7 @@
40 40 <Borland.Personality>Delphi.Personality</Borland.Personality>
41 41 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
42 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">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 Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</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">6</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.6</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 44 </ProjectExtensions>
45 45 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
46 46 <ItemGroup>
... ...
cacic280.res
No preview for this file type
cacicservice/cacicservice.dproj
... ... @@ -37,7 +37,7 @@
37 37 <Borland.Personality>Delphi.Personality</Borland.Personality>
38 38 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
39 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">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>
  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">6</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.6</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 41 </ProjectExtensions>
42 42 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
43 43 <ItemGroup>
... ...
cacicservice/cacicservice.res
No preview for this file type
gercols/gercols.dpr
... ... @@ -245,9 +245,6 @@ Begin
245 245 objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName);
246 246 if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then
247 247 Begin
248   - objCacic.setValueToFile('Configs','forca_coleta',
249   - objCacic.getValueFromTags('forca_coleta', strRetorno),
250   - strGerColsInfFileName);
251 248 objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName);
252 249 objCacic.setValueToFile('Configs','WebServicesFolderName',objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>'), strChkSisInfFileName);
253 250 objCacic.setWebManagerAddress(objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>'));
... ... @@ -369,6 +366,59 @@ Begin
369 366 End;
370 367 end;
371 368  
  369 +procedure getTest();
  370 +var strRetorno,
  371 + v_mensagem_log,
  372 + strKeyWord : string;
  373 + textfileKeyWord : TextFile;
  374 +Begin
  375 + Try
  376 + // Verifico comunicação com o Módulo Gerente WEB.
  377 + // Tratamentos de valores para tráfego POST:
  378 + objCacic.setValueToFile('Configs','ConexaoOK','N', strGerColsInfFileName);
  379 +
  380 + strAcaoGerCols := 'Preparando teste de comunicação com Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').';
  381 +
  382 + objCacic.writeDebugLog('getTest: Teste de Comunicação.');
  383 +
  384 + Try
  385 + strRetorno := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, 'Testando comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').');
  386 +
  387 + if (strRetorno <> '0') Then
  388 + Begin
  389 + objCacic.setBoolCipher(not objCacic.isInDebugMode);
  390 + objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName);
  391 + if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then
  392 + Begin
  393 + objCacic.setValueToFile('Configs','forca_coleta',
  394 + objCacic.getValueFromTags('forca_coleta', strRetorno),
  395 + strGerColsInfFileName);
  396 + objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName);
  397 + objCacic.setValueToFile('Configs','WebServicesFolderName',objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>'), strChkSisInfFileName);
  398 + objCacic.setWebManagerAddress(objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>'));
  399 + objCacic.setWebServicesFolderName(objCacic.getValueFromTags('WebServicesFolderName', strRetorno,'<>'));
  400 + End;
  401 +
  402 + strAcaoGerCols := 'IP validado pelo Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').';
  403 + objCacic.writeDebugLog('getTest: ' + strAcaoGerCols);
  404 + End;
  405 + except
  406 + on E : Exception do
  407 + Begin
  408 + objCacic.writeDebugLog('getTest: 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+').');
  410 + objCacic.writeDailyLog('Insucesso na comunicação com o Módulo Gerente WEB ('+objCacic.getWebManagerAddress+').');
  411 + End;
  412 + End;
  413 + Except
  414 + on E : Exception do
  415 + Begin
  416 + objCacic.writeDebugLog('getTest: Lançando Exceção #5');
  417 + objCacic.writeExceptionLog(E.Message,E.ClassName,'getTest: Exceção #5');
  418 + End;
  419 + End;
  420 +end;
  421 +
372 422 procedure criaCookie(strFileName : String);
373 423 var textFileAguarde : TextFile;
374 424 Begin
... ... @@ -783,10 +833,15 @@ Begin
783 833  
784 834 // Primeira chamada efetuada pelo Agente Principal para posterior ação de coletas
785 835 If FindCmdLineSwitch('getConfigs', True) Then
786   - Begin
  836 + Begin
787 837 getConfigs(true);
788 838 Finalizar(false);
789   - End;
  839 + End
  840 + //Chamada realizada de minuto em minuto para verificar se há coleta a ser forçada.
  841 + else if FindCmdLineSwitch ('getTest', True) then
  842 + begin
  843 + getTest();
  844 + end;
790 845  
791 846 // Chamada efetuada pelo Agente Principal quando da existência de temp\<AgentePrincipal>.exe para AutoUpdate
792 847 If FindCmdLineSwitch('UpdatePrincipal', True) Then
... ... @@ -1583,7 +1638,7 @@ Begin
1583 1638 // Se for uma coleta forçada, também grava as informações.
1584 1639 If (objCacic.enCrypt(strColetaAtual) <> strColetaAnterior) or
1585 1640 (strColetaAnterior = '') or
1586   - (objCacic.getValueFromFile('Configs', 'forca_coleta') = 's') Then
  1641 + (objCacic.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') Then
1587 1642 Begin
1588 1643 strAcaoGercols := 'Enviando coleta de informações sobre ' + objCacic.getValueFromTags('te_descricao_breve',strActionDefinition) + ' para o Gerente WEB ('+objCacic.getWebManagerAddress+').';
1589 1644 objCacic.writeDailyLog(strAcaoGercols);
... ... @@ -1685,7 +1740,14 @@ begin
1685 1740 CriaCookie('aguarde_GER.txt');
1686 1741  
1687 1742 // Esse teste também colocará a estação de trabalho em DEBUG, caso seja determinado no Gerente WEB
1688   - Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, strAcaoGerCols);
  1743 + if FindCmdLineSwitch ('getTest', True) then
  1744 + begin
  1745 + getTest();
  1746 + Finalizar(true);
  1747 + halt(0);
  1748 + end
  1749 + else
  1750 + Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/test', strFieldsAndValuesToRequest, objCacic.getLocalFolderName, strAcaoGerCols);
1689 1751  
1690 1752 objCacic.setBoolCipher(not objCacic.isInDebugMode);
1691 1753  
... ...
gercols/gercols.dproj
... ... @@ -38,7 +38,7 @@
38 38 <Borland.Personality>Delphi.Personality</Borland.Personality>
39 39 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
40 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">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 Gerente de Coletas</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">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">6</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.6</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 42 </ProjectExtensions>
43 43 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
44 44 <ItemGroup>
... ...
gercols/gercols.res
No preview for this file type
installcacic/installcacic.dproj
... ... @@ -32,7 +32,7 @@
32 32 <Borland.Personality>Delphi.Personality</Borland.Personality>
33 33 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
34 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">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>
  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">6</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.6</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 36 </ProjectExtensions>
37 37 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
38 38 <ItemGroup>
... ...
installcacic/installcacic.res
No preview for this file type
main.dfm
1 1 object FormularioGeral: TFormularioGeral
2   - Left = 411
3   - Top = 225
  2 + Left = 244
  3 + Top = 55
4 4 HorzScrollBar.Visible = False
5 5 VertScrollBar.Visible = False
6 6 BiDiMode = bdLeftToRight
... ... @@ -1770,4 +1770,10 @@ object FormularioGeral: TFormularioGeral
1770 1770 Left = 8
1771 1771 Top = 568
1772 1772 end
  1773 + object CheckForcaColeta: TTimer
  1774 + Interval = 60000
  1775 + OnTimer = CheckForcaColetaTimer
  1776 + Left = 392
  1777 + Top = 568
  1778 + end
1773 1779 end
... ...
main.pas
... ... @@ -176,6 +176,7 @@ type
176 176 ApplicationEvents1: TApplicationEvents;
177 177 Panel1: TPanel;
178 178 ExecutarMapa1: TMenuItem;
  179 + CheckForcaColeta: TTimer;
179 180 procedure RemoveIconesMortos;
180 181 procedure ChecaCONFIGS;
181 182 procedure CriaFormSenha(Sender: TObject);
... ... @@ -261,6 +262,7 @@ type
261 262 procedure InvocaMapa1Click(Sender: TObject);
262 263 procedure ExecutarMapa1DrawItem(Sender: TObject; ACanvas: TCanvas;
263 264 ARect: TRect; Selected: Boolean);
  265 + procedure CheckForcaColetaTimer(Sender: TObject);
264 266 private
265 267 FUsb : TUsbClass;
266 268 ShutdownEmExecucao : Boolean;
... ... @@ -1209,7 +1211,10 @@ begin
1209 1211  
1210 1212 timerNuExecApos.Enabled := False;
1211 1213 objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"');
1212   - 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);
  1214 + if (p_acao = 'getTest') then //se for getTest, esperar a aplicação finalizar.
  1215 + 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)
  1216 + else
  1217 + 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);
1213 1218 g_intStatus := 1;
1214 1219 objCacic.setBoolCipher(not objCacic.isInDebugMode);
1215 1220 End
... ... @@ -1220,7 +1225,8 @@ end;
1220 1225  
1221 1226 procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject);
1222 1227 begin
1223   - Invoca_MapaCacic;
  1228 + if (ActualActivity<>4) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) <> 'ativo') then
  1229 + Invoca_MapaCacic;
1224 1230 end;
1225 1231  
1226 1232 ////////////////////////////////////////////////////////////////////////////////
... ... @@ -1283,17 +1289,18 @@ begin
1283 1289 FindCmdLineSwitch('atualizacao', True) or
1284 1290 Pode_Coletar or
1285 1291 (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') or
1286   - (trim(objCACIC.getValueFromFile('Configs','ForcaColeta', strGerColsInfFileName))='S') Then
  1292 + (trim(objCACIC.getValueFromFile('Configs','forca_coleta', strGerColsInfFileName))='S') Then
1287 1293 Begin
1288 1294 ////////////////////////////////////////////////////////////////////////////////
1289 1295 // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
1290 1296 ////////////////////////////////////////////////////////////////////////////////
1291 1297 if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s')
1292   - and (ActualActivity<>4) then begin
  1298 + and (ActualActivity<>4)
  1299 + and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) <> 'ativo') then begin
1293 1300 objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
1294 1301 Invoca_MapaCacic;
1295 1302 end;
1296   -
  1303 +
1297 1304 timerCheckNoMinuto.Enabled := false;
1298 1305 objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...');
1299 1306  
... ... @@ -1319,8 +1326,7 @@ begin
1319 1326  
1320 1327 objCACIC.writeDebugLog('ExecutaCACIC: Primeira chamada ao Gerente de Coletas...');
1321 1328 Invoca_GerCols('getConfigs');
1322   - if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGercolsInfFileName) = 's') then
1323   - Invoca_GerCols('collect');
  1329 +
1324 1330 sleep(3000); // Pausa para início do Gerente de Coletas e criação do arquivo temp\aguarde_GER.txt
1325 1331  
1326 1332 Application.ProcessMessages;
... ... @@ -1330,7 +1336,8 @@ begin
1330 1336 // Serão 4 tentativas por minuto
1331 1337 // Serão 30 minutos no máximo de tentativas, totalizando 120
1332 1338 intTentativas := 0;
1333   - while not Pode_Coletar and (intTentativas < 121) do
  1339 + while (not Pode_Coletar and (intTentativas < 121)) and
  1340 + (objCACIC.getValueFromFile('Configs', 'forca_coleta',strGercolsInfFileName) <> 'S') do
1334 1341 Begin
1335 1342 objCACIC.writeDebugLog('ExecutaCACIC: Aguardando 15 segundos...');
1336 1343 Application.ProcessMessages;
... ... @@ -2217,6 +2224,13 @@ begin
2217 2224 End;
2218 2225 end;
2219 2226  
  2227 +procedure TFormularioGeral.CheckForcaColetaTimer(Sender: TObject);
  2228 +begin
  2229 + Invoca_GerCols('getTest');
  2230 + if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') then
  2231 + Invoca_GerCols('collect');
  2232 +end;
  2233 +
2220 2234 procedure TFormularioGeral.CheckIfDownloadedVersion;
2221 2235 Begin
2222 2236 objCACIC.writeDebugLog('CheckIfDownloadedVersion: Verificando existência de nova versão baixada do Agente Principal...');
... ...