Commit 02a9fd6e493ee913d9431b7942e96894688cceb7
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
No preview for this file type
MapaTesteProj/MapaTeste.dcu
No preview for this file type
MapaTesteProj/MapaTeste.dfm
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">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 | 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
| ... | ... | @@ -243,6 +243,9 @@ Begin |
| 243 | 243 | Begin |
| 244 | 244 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| 245 | 245 | objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); |
| 246 | + objCacic.setValueToFile('Configs','forca_coleta', | |
| 247 | + objCacic.getValueFromTags('forca_coleta', strRetorno), | |
| 248 | + strGerColsInfFileName); | |
| 246 | 249 | if (objCacic.getValueFromTags('WebManagerAddress', strRetorno,'<>') <> '') then |
| 247 | 250 | Begin |
| 248 | 251 | objCacic.setValueToFile('Configs','WebManagerAddress' ,objCacic.getValueFromTags('WebManagerAddress' , strRetorno,'<>'), strChkSisInfFileName); | ... | ... |
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">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 | 36 | </ProjectExtensions> |
| 37 | 37 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 38 | 38 | <ItemGroup> | ... | ... |
installcacic/installcacic.res
No preview for this file type
installcacic/uInstallCACIC.pas
| ... | ... | @@ -797,8 +797,6 @@ begin |
| 797 | 797 | else |
| 798 | 798 | objCacic.writeDebugLog('installCACIC: Problema no Download do Verificador de Integridade do Sistema (ChkSIS)'); |
| 799 | 799 | End; |
| 800 | - // EXECUTA MAPACACIC SEMPRE. | |
| 801 | - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',true,SW_SHOW); | |
| 802 | 800 | Except |
| 803 | 801 | on E : Exception do |
| 804 | 802 | Begin | ... | ... |
main.pas
| ... | ... | @@ -273,10 +273,6 @@ type |
| 273 | 273 | procedure Finaliza(boolNormal : boolean = true); |
| 274 | 274 | // procedure MontaVetoresPatrimonio(p_strConfigs : String); |
| 275 | 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 | 276 | procedure Invoca_MapaCacic; |
| 281 | 277 | procedure CheckIfDownloadedVersion; |
| 282 | 278 | procedure WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND; |
| ... | ... | @@ -972,8 +968,6 @@ begin |
| 972 | 968 | g_intStatusAnterior := -1; |
| 973 | 969 | |
| 974 | 970 | // Aplicar traduções GetText,etc... |
| 975 | - // | |
| 976 | - // | |
| 977 | 971 | |
| 978 | 972 | strMenuCaptionLAT := Mnu_LogAtividades.Caption; |
| 979 | 973 | strMenuCaptionCON := Mnu_Configuracoes.Caption; |
| ... | ... | @@ -1288,7 +1282,8 @@ begin |
| 1288 | 1282 | if FindCmdLineSwitch('execute', True) or |
| 1289 | 1283 | FindCmdLineSwitch('atualizacao', True) or |
| 1290 | 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 | 1287 | Begin |
| 1293 | 1288 | //////////////////////////////////////////////////////////////////////////////// |
| 1294 | 1289 | // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC // |
| ... | ... | @@ -1298,7 +1293,7 @@ begin |
| 1298 | 1293 | objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...'); |
| 1299 | 1294 | Invoca_MapaCacic; |
| 1300 | 1295 | end; |
| 1301 | - | |
| 1296 | + | |
| 1302 | 1297 | timerCheckNoMinuto.Enabled := false; |
| 1303 | 1298 | objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...'); |
| 1304 | 1299 | ... | ... |