Download as
Browse Code »

Commit 07eeb6edfff4c4960e3a97bef556450a8011007d

Authored by Eric Menezes Noronha
1 parent e1ef6b04
Exists in master

-Pequenas modificações para mapacacic 

-Modificação da build
Showing 3 changed files with 14 additions and 12 deletions   Show diff stats
cacic280.dproj
  Diff comments   View file @07eeb6e
@@ -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">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 Agente Principal</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.4</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">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>
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 @07eeb6e
No preview for this file type
@@ -668,7 +668,9 @@ Begin @@ -668,7 +668,9 @@ Begin
668 else if FileExists(objCACIC.getLocalFolderName + 'Temp\aguarde_GER.txt') then 668 else if FileExists(objCACIC.getLocalFolderName + 'Temp\aguarde_GER.txt') then
669 Result := 1 // COLETANDO 669 Result := 1 // COLETANDO
670 else if FileExists(objCACIC.getLocalFolderName + 'Temp\aguarde_SRCACIC.txt') then 670 else if FileExists(objCACIC.getLocalFolderName + 'Temp\aguarde_SRCACIC.txt') then
671 - Result := 3; // EM SUPORTE REMOTO 671 + Result := 3 // EM SUPORTE REMOTO
  672 + else if FileExists(objCacic.getLocalFolderName + 'Temp\aguarde_MAPACACIC.txt') then
  673 + Result := 4;
672 674
673 objCACIC.writeDebugLog('ActualActivity: Retornando '+IntToStr(Result)); 675 objCACIC.writeDebugLog('ActualActivity: Retornando '+IntToStr(Result));
674 objCACIC.writeDebugLog('ActualActivity: END'); 676 objCACIC.writeDebugLog('ActualActivity: END');
@@ -1214,7 +1216,7 @@ begin @@ -1214,7 +1216,7 @@ begin
1214 timerNuExecApos.Enabled := False; 1216 timerNuExecApos.Enabled := False;
1215 objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"'); 1217 objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"');
1216 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); 1218 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);
1217 - g_intStatus := 1; 1219 + g_intStatus := 1;
1218 objCacic.setBoolCipher(not objCacic.isInDebugMode); 1220 objCacic.setBoolCipher(not objCacic.isInDebugMode);
1219 End 1221 End
1220 else 1222 else
@@ -1282,21 +1284,21 @@ var v_mensagem, @@ -1282,21 +1284,21 @@ var v_mensagem,
1282 intTentativas : integer; 1284 intTentativas : integer;
1283 begin 1285 begin
1284 try 1286 try
1285 -////////////////////////////////////////////////////////////////////////////////  
1286 -// CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //  
1287 -////////////////////////////////////////////////////////////////////////////////  
1288 - if trim(objCACIC.getValueFromFile('Configs','col_patr_exe',  
1289 - strGerColsInfFileName))<>'s' then begin  
1290 - Invoca_MapaCacic;  
1291 - end;  
1292 -// AGUARDANDO CONFIGURAÇÃO DO GERENTE, SENDO INVOCADO NA INSTALAÇÃO, ATÉ O MOMENTO.  
1293 -////////////////////////////// FIM /////////////////////////////////////////////  
1294 1287
1295 if FindCmdLineSwitch('execute', True) or 1288 if FindCmdLineSwitch('execute', True) or
1296 FindCmdLineSwitch('atualizacao', True) or 1289 FindCmdLineSwitch('atualizacao', True) or
1297 Pode_Coletar or 1290 Pode_Coletar or
1298 (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') Then 1291 (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') Then
1299 Begin 1292 Begin
  1293 + ////////////////////////////////////////////////////////////////////////////////
  1294 + // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
  1295 + ////////////////////////////////////////////////////////////////////////////////
  1296 + if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s')
  1297 + and (ActualActivity<>4) then begin
  1298 + objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
  1299 + Invoca_MapaCacic;
  1300 + end;
  1301 +
1300 timerCheckNoMinuto.Enabled := false; 1302 timerCheckNoMinuto.Enabled := false;
1301 objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...'); 1303 objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...');
1302 1304