From 07eeb6edfff4c4960e3a97bef556450a8011007d Mon Sep 17 00:00:00 2001
From: Eric Menezes Noronha <ericmenezesn@gmail.com>
Date: Wed, 16 Apr 2014 17:47:39 -0300
Subject: [PATCH] -Pequenas modificações para mapacacic -Modificação da build

---
 cacic280.dproj |  2 +-
 cacic280.res   | Bin 4872 -> 0 bytes
 main.pas       | 24 +++++++++++++-----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cacic280.dproj b/cacic280.dproj
index 4c46104..1d31083 100644
--- a/cacic280.dproj
+++ b/cacic280.dproj
@@ -40,7 +40,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<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>
+<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>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
diff --git a/cacic280.res b/cacic280.res
index d4ebe51..2fd9702 100644
Binary files a/cacic280.res and b/cacic280.res differ
diff --git a/main.pas b/main.pas
index e91bd8d..6855379 100755
--- a/main.pas
+++ b/main.pas
@@ -668,7 +668,9 @@ Begin
   else if FileExists(objCACIC.getLocalFolderName + 'Temp\aguarde_GER.txt')      then
       Result := 1 // COLETANDO
   else if FileExists(objCACIC.getLocalFolderName + 'Temp\aguarde_SRCACIC.txt')  then
-      Result := 3; // EM SUPORTE REMOTO
+      Result := 3 // EM SUPORTE REMOTO
+  else if FileExists(objCacic.getLocalFolderName + 'Temp\aguarde_MAPACACIC.txt') then
+      Result := 4;
 
   objCACIC.writeDebugLog('ActualActivity: Retornando '+IntToStr(Result));
   objCACIC.writeDebugLog('ActualActivity: END');
@@ -1214,7 +1216,7 @@ begin
             timerNuExecApos.Enabled  := False;
             objCACIC.writeDebugLog('Invoca_GerCols: Criando Processo GerCols => "'+objCACIC.getLocalFolderName + 'Modules\gercols.exe /'+p_acao+' /WebServicesFolderName='+objCACIC.getWebServicesFolderName +' /LocalFolderName='+objCACIC.getLocalFolderName + ' /WebManagerAddress=' + objCACIC.getWebManagerAddress + '"');
             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);
-            g_intStatus := 1;
+            g_intStatus :=             1;
             objCacic.setBoolCipher(not objCacic.isInDebugMode);
           End
         else
@@ -1282,21 +1284,21 @@ var v_mensagem,
     intTentativas   : integer;
 begin
    try
-////////////////////////////////////////////////////////////////////////////////
-//               CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC                   //
-////////////////////////////////////////////////////////////////////////////////
-   if trim(objCACIC.getValueFromFile('Configs','col_patr_exe',
-                                      strGerColsInfFileName))<>'s' then begin
-      Invoca_MapaCacic;
-   end;
-//          AGUARDANDO CONFIGURAÇÃO DO GERENTE, SENDO INVOCADO NA INSTALAÇÃO, ATÉ O MOMENTO.
-////////////////////////////// FIM /////////////////////////////////////////////
 
      if FindCmdLineSwitch('execute', True)     or
         FindCmdLineSwitch('atualizacao', True) or
         Pode_Coletar                           or
         (trim(objCACIC.getValueFromFile('Configs','DtHrUltimaColeta', strGerColsInfFileName))='') Then
         Begin
+          ////////////////////////////////////////////////////////////////////////////////
+          //               CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC                   //
+          ////////////////////////////////////////////////////////////////////////////////
+         if (trim(objCACIC.getValueFromFile('Configs','col_patr_exe', strGerColsInfFileName))<>'s')
+            and (ActualActivity<>4) then begin
+                objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
+                Invoca_MapaCacic;
+         end;
+
           timerCheckNoMinuto.Enabled := false;
           objCACIC.writeDebugLog('ExecutaCACIC: Preparando chamada ao Gerente de Coletas...');
 
--
libgit2 0.21.2