Download as
Browse Code »

Commit 950a09c2056c213d213689f81110c61886e982f7

Authored by Eric Menezes Noronha
1 parent 8b7a1cc6
Exists in master

Chamada do mapa independe do agente agora. O gerente manda apenas um 'true' ou … 

…'false' para a exeucação do mesmo, juntamente com a mensagem contendo os termos.
Modificadação do método de comunicação para que caso dê problema conectar ao get/update.
Showing 17 changed files with 126 additions and 32 deletions   Show diff stats
CACIC_Comm.pas
  Diff comments   View file @950a09c
@@ -37,7 +37,8 @@ var tStringStrResponseCS : TStringStream; @@ -37,7 +37,8 @@ var tStringStrResponseCS : TStringStream;
37 strWin32_SoftwareFeature, 37 strWin32_SoftwareFeature,
38 strTeDebugging, 38 strTeDebugging,
39 strMac, 39 strMac,
40 - strSubnet : String; 40 + strSubnet,
  41 + route : String;
41 Begin 42 Begin
42 Try 43 Try
43 tStringStrResponseCS := TStringStream.Create(''); 44 tStringStrResponseCS := TStringStream.Create('');
@@ -112,7 +113,7 @@ Begin @@ -112,7 +113,7 @@ Begin
112 Try 113 Try
113 idHTTP1.AllowCookies := true; 114 idHTTP1.AllowCookies := true;
114 idHTTP1.AuthRetries := 1; 115 idHTTP1.AuthRetries := 1;
115 - idHTTP1.HandleRedirects := false; 116 + idHTTP1.HandleRedirects := true;
116 idHTTP1.ProxyParams.BasicAuthentication := false; 117 idHTTP1.ProxyParams.BasicAuthentication := false;
117 idHTTP1.ProxyParams.ProxyPort := 0; 118 idHTTP1.ProxyParams.ProxyPort := 0;
118 idHTTP1.ReadTimeout := 0; 119 idHTTP1.ReadTimeout := 0;
@@ -131,9 +132,25 @@ Begin @@ -131,9 +132,25 @@ Begin
131 IdHTTP1.Post(pStrFullURL, tstrRequest, tStringStrResponseCS); 132 IdHTTP1.Post(pStrFullURL, tstrRequest, tStringStrResponseCS);
132 Except 133 Except
133 on E : Exception do 134 on E : Exception do
134 - Begin  
135 - objCacicCOMM.writeExceptionLog(E.Message,E.ClassName,'ERRO! Comunicação impossível com o endereço ' + pStrFullURL);  
136 - End; 135 + Begin
  136 + objCacicCOMM.writeExceptionLog(E.Message,E.ClassName,'ERRO![1] Comunicação impossível com o endereço ' + pStrFullURL);
  137 + if not (pos('get/update',pStrFullUrl) > 0) then
  138 + begin
  139 + route:= '';
  140 + if (pos('get/test', pStrFullUrl) > 0) then
  141 + route:= 'get/test'
  142 + else if (pos('get/config', pStrFullUrl) > 0) then
  143 + route:= 'get/config';
  144 + if (route <> '') then
  145 + begin
  146 + delete(pStrFullUrl, pos(route, pStrFullUrl), length(pStrFullUrl));
  147 + pStrFullUrl := pStrFullUrl + 'get/update';
  148 + objCacicCOMM.writeExceptionLog(E.Message,E.ClassName,'Realizando nova tentativa em ' + pStrFullURL);
  149 + objCacicCOMM.writeDailyLog('Realizando nova tentativa em rota alternativa');
  150 + IdHTTP1.Post(pStrFullUrl, tstrRequest, tStringStrResponseCS);
  151 + end;
  152 + end;
  153 + End;
137 End; 154 End;
138 objCacicCOMM.writeDebugLog('Comm: Retorno -> ' + tStringStrResponseCS.DataString); 155 objCacicCOMM.writeDebugLog('Comm: Retorno -> ' + tStringStrResponseCS.DataString);
139 idHTTP1.Disconnect; 156 idHTTP1.Disconnect;
@@ -170,7 +170,7 @@ Begin @@ -170,7 +170,7 @@ Begin
170 if FileExists(objCACIC.getLocalFolderName + '\temp\aguarde_MAPACACIC.txt') then 170 if FileExists(objCACIC.getLocalFolderName + '\temp\aguarde_MAPACACIC.txt') then
171 objCACIC.deleteFileOrFolder(objCacic.getLocalFolderName + 171 objCACIC.deleteFileOrFolder(objCacic.getLocalFolderName +
172 '\temp\aguarde_MAPACACIC.txt'); 172 '\temp\aguarde_MAPACACIC.txt');
173 - 173 + objCacic.setValueToFile('Configs', 'Patrimonio', 'false', strGercolsInfFileName);
174 Application.ProcessMessages; 174 Application.ProcessMessages;
175 175
176 Sair; 176 Sair;
@@ -517,6 +517,7 @@ Begin @@ -517,6 +517,7 @@ Begin
517 lbEtiqueta5.Visible := true; 517 lbEtiqueta5.Visible := true;
518 lbEtiqueta5.ShowHint := true; 518 lbEtiqueta5.ShowHint := true;
519 lbEtiqueta5.hint := 'Digite seu nome, não foi possível recuperá-lo.'; 519 lbEtiqueta5.hint := 'Digite seu nome, não foi possível recuperá-lo.';
  520 + objCacic.writeDailyLog('Não foi possível pegar nome do ldap');
520 end; 521 end;
521 522
522 // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' + 523 // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' +
@@ -943,7 +944,7 @@ begin @@ -943,7 +944,7 @@ begin
943 ldap.Timeout := 5000; 944 ldap.Timeout := 5000;
944 if ldap.Login and ldap.Bind then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind) 945 if ldap.Login and ldap.Bind then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
945 begin 946 begin
946 - ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio2, retorno); //Faz a pesquisa, com o CPF repassado. 947 + ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio4, retorno); //Faz a pesquisa, com o CPF repassado.
947 result := LDAPResultdump(ldap.SearchResult); 948 result := LDAPResultdump(ldap.SearchResult);
948 objCACIC.writeDailyLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.'); 949 objCACIC.writeDailyLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.');
949 ldap.Logout; 950 ldap.Logout;
Mapa/mapacacic.dproj
  Diff comments   View file @950a09c
@@ -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">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> 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">20</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.20</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 @950a09c
No preview for this file type
cacic280.dproj
  Diff comments   View file @950a09c
@@ -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">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> 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">20</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.20</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 @950a09c
No preview for this file type
cacicservice/cacicservice.dproj
  Diff comments   View file @950a09c
@@ -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">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> 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">20</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.20</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 @950a09c
No preview for this file type
chksis/chksis.dpr
  Diff comments   View file @950a09c
@@ -185,7 +185,81 @@ begin @@ -185,7 +185,81 @@ begin
185 185
186 // 5 segundos para espera de possível FTP em andamento... 186 // 5 segundos para espera de possível FTP em andamento...
187 Sleep(5000); 187 Sleep(5000);
188 - End; 188 + End
  189 + else
  190 + begin
  191 + strCommResponse := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/update', strFieldsAndValuesToRequest, objCacic.getLocalFolderName);
  192 + if (strCommResponse <> '0') then
  193 + begin
  194 + objCacic.writeDailyLog('executeChkSIS: Iniciando segunda tentativa de comunicação sem a obrigatoriedade do MAC');
  195 + objCacic.setBoolCipher(not objCacic.isInDebugMode);
  196 + objCacic.setMainProgramName( objCacic.deCrypt(objCacic.getValueFromTags('MainProgramName' , strCommResponse, '<>')));
  197 + objCacic.setMainProgramHash( objCacic.deCrypt(objCacic.getValueFromTags(objCacic.getMainProgramName + '_HASH' , strCommResponse, '<>'),true,true));
  198 + objCacic.setWebManagerAddress( objCacic.deCrypt(objCacic.getValueFromTags('WebManagerAddress' , strCommResponse, '<>')));
  199 + objCacic.setWebServicesFolderName(objCacic.deCrypt(objCacic.getValueFromTags('WebServicesFolderName' , strCommResponse, '<>')));
  200 + objCacic.setLocalFolderName( objCacic.deCrypt(objCacic.getValueFromTags('LocalFolderName' , strCommResponse, '<>')));
  201 +
  202 + objCacic.writeDebugLog('executeChkSIS: Resposta: ' + strCommResponse);
  203 +
  204 + objCacic.setValueToFile('Configs' ,'NmUsuarioLoginServUpdates', objCacic.getValueFromTags('nm_usuario_login_serv_updates' , strCommResponse, '<>'), strChkSisInfFileName);
  205 + objCacic.setValueToFile('Configs' ,'NuPortaServUpdates' , objCacic.getValueFromTags('nu_porta_serv_updates' , strCommResponse, '<>'), strChkSisInfFileName);
  206 + objCacic.setValueToFile('Configs' ,'TePathServUpdates' , objCacic.getValueFromTags('te_path_serv_updates' , strCommResponse, '<>'), strChkSisInfFileName);
  207 + objCacic.setValueToFile('Configs' ,'TeSenhaLoginServUpdates' , objCacic.getValueFromTags('te_senha_login_serv_updates' , strCommResponse, '<>'), strChkSisInfFileName);
  208 + objCacic.setValueToFile('Configs' ,'TeServUpdates' , objCacic.getValueFromTags('te_serv_updates' , strCommResponse, '<>'), strChkSisInfFileName);
  209 + objCacic.setValueToFile('Configs' ,'WebManagerAddress' , objCacic.getValueFromTags('WebManagerAddress' , strCommResponse, '<>'), strChkSisInfFileName);
  210 + objCacic.setValueToFile('Configs' ,'WebServicesFolderName' , objCacic.getValueFromTags('WebServicesFolderName' , strCommResponse, '<>'), strChkSisInfFileName);
  211 + objCacic.setValueToFile('Hash-Codes','CACICSERVICE.EXE' , objCacic.getValueFromTags('CACICSERVICE.EXE_HASH' , strCommResponse, '<>'), strChkSisInfFileName);
  212 + objCacic.setValueToFile('Hash-Codes','CHKSIS.EXE' , objCacic.getValueFromTags('CHKSIS.EXE_HASH' , strCommResponse, '<>'), strChkSisInfFileName);
  213 + objCacic.setValueToFile('Hash-Codes','GERCOLS.EXE' , objCacic.getValueFromTags('GERCOLS.EXE_HASH' , strCommResponse, '<>'), strChkSisInfFileName);
  214 + objCacic.setValueToFile('Hash-Codes','MAPACACIC.EXE' , objCacic.getValueFromTags('MAPACACIC.EXE_HASH' , strCommResponse, '<>'), strChkSisInfFileName);
  215 + objCacic.setValueToFile('Hash-Codes',objCacic.getMainProgramName, objCacic.getValueFromTags(objCacic.getMainProgramName + '_HASH', strCommResponse, '<>'), strChkSisInfFileName);
  216 + objCacic.deleteFileOrFolder(objCacic.getLocalFolderName + 'aguarde_CACIC.txt');
  217 +
  218 + // Auto verificação de versão
  219 + verifyAndGetModules('chksis.exe',
  220 + objCacic.deCrypt(objCacic.getValueFromTags('CHKSIS.EXE_HASH', strCommResponse, '<>'),true,true),
  221 + objCacic.getWinDir,
  222 + objCacic.getLocalFolderName,
  223 + objCacic,
  224 + strChkSisInfFileName);
  225 +
  226 + // Verificação de versão do Agente Principal
  227 + verifyAndGetModules(LowerCase(objCacic.getMainProgramName),
  228 + objCacic.getMainProgramHash,
  229 + objCacic.getLocalFolderName,
  230 + objCacic.getLocalFolderName,
  231 + objCacic,
  232 + strChkSisInfFileName);
  233 +
  234 + // Verificação de versão do Agente Gerente de Coletas
  235 + verifyAndGetModules('gercols.exe',
  236 + objCacic.deCrypt(objCacic.getValueFromTags('GERCOLS.EXE_HASH', strCommResponse, '<>'),true,true),
  237 + objCacic.getLocalFolderName + 'Modules',
  238 + objCacic.getLocalFolderName,
  239 + objCacic,
  240 + strChkSisInfFileName);
  241 +
  242 + // Verificação de versão do Serviço de Sustentação do Agente CACIC
  243 + verifyAndGetModules('cacicservice.exe',
  244 + objCacic.deCrypt(objCacic.getValueFromTags('CACICSERVICE.EXE_HASH', strCommResponse, '<>'),true,true),
  245 + objCacic.getWinDir,
  246 + objCacic.getLocalFolderName,
  247 + objCacic,
  248 + strChkSisInfFileName);
  249 +
  250 + // Verificação de versão do Mapa Cacic
  251 + verifyAndGetModules('mapacacic.exe',
  252 + objCacic.deCrypt(objCacic.getValueFromTags('MAPACACIC.EXE_HASH', strCommResponse, '<>'),true,true),
  253 + objCacic.getLocalFolderName + 'Modules',
  254 + objCacic.getLocalFolderName,
  255 + objCacic,
  256 + strChkSisInfFileName);
  257 +
  258 + // 5 segundos para espera de possível FTP em andamento...
  259 + Sleep(5000);
  260 + end;
  261 + end;
  262 +
189 Except 263 Except
190 on E : Exception do 264 on E : Exception do
191 Begin 265 Begin
chksis/chksis.dproj
  Diff comments   View file @950a09c
@@ -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">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> 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">20</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.20</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 @950a09c
No preview for this file type
gercols/gercols.dproj
  Diff comments   View file @950a09c
@@ -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">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> 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">20</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.20</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 @950a09c
No preview for this file type
installcacic/installcacic.dproj
  Diff comments   View file @950a09c
@@ -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">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> 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">20</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.20</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 @950a09c
No preview for this file type
installcacic/uInstallCACIC.pas
  Diff comments   View file @950a09c
@@ -487,7 +487,9 @@ begin @@ -487,7 +487,9 @@ begin
487 objCacic.writeDebugLog('installCACIC: Preparando Chamada ao Gerente WEB: "' + objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName +'get/config'); 487 objCacic.writeDebugLog('installCACIC: Preparando Chamada ao Gerente WEB: "' + objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName +'get/config');
488 informaProgresso('Fazendo contato com Gerente WEB.'); 488 informaProgresso('Fazendo contato com Gerente WEB.');
489 informaProgresso('Endereço do gerente: ' + objCacic.getWebManagerAddress); 489 informaProgresso('Endereço do gerente: ' + objCacic.getWebManagerAddress);
  490 +
490 strCommResponse := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/config', strFieldsAndValuesToRequest, objCACIC.getLocalFolderName); 491 strCommResponse := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/config', strFieldsAndValuesToRequest, objCACIC.getLocalFolderName);
  492 +
491 if (strCommResponse <> '0') then 493 if (strCommResponse <> '0') then
492 Begin 494 Begin
493 { Já realizados na chamada ao get_test.php substituido por get/test 495 { Já realizados na chamada ao get_test.php substituido por get/test
@@ -1126,6 +1126,16 @@ begin @@ -1126,6 +1126,16 @@ begin
1126 ExecutaCACIC(nil); 1126 ExecutaCACIC(nil);
1127 end; 1127 end;
1128 Invoca_GerCols('getMapa'); 1128 Invoca_GerCols('getMapa');
  1129 + ////////////////////////////////////////////////////////////////////////////////
  1130 + // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
  1131 + ////////////////////////////////////////////////////////////////////////////////
  1132 + if (not FileExists(objCacic.getLocalFolderName + 'Temp\aguarde_MAPACACIC.txt'))
  1133 + and (objCACIC.getValueFromFile('Configs', 'Patrimonio', strGerColsInfFileName) = 'true') then
  1134 + begin
  1135 + objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');
  1136 + Invoca_MapaCacic;
  1137 + sleep(10000);
  1138 + end;
1129 // Os timers iniciam-se desabilitados... Mais � frente receber�o par�metros de tempo para execu��o. 1139 // Os timers iniciam-se desabilitados... Mais � frente receber�o par�metros de tempo para execu��o.
1130 timerNuExecApos.Enabled := False; 1140 timerNuExecApos.Enabled := False;
1131 timerNuIntervalo.Enabled := False; 1141 timerNuIntervalo.Enabled := False;
@@ -1322,7 +1332,7 @@ end; @@ -1322,7 +1332,7 @@ end;
1322 procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject); 1332 procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject);
1323 begin 1333 begin
1324 FormularioGeral.Invoca_GerCols('getMapa'); 1334 FormularioGeral.Invoca_GerCols('getMapa');
1325 - if (ActualActivity=0) and (objCACIC.getValueFromFile('Configs', 'modulo_patr', strGerColsInfFileName) = 'S') then 1335 + if (ActualActivity=0) and (objCACIC.getValueFromFile('Configs', 'Patrimonio', strGerColsInfFileName) = 'true') then
1326 Invoca_MapaCacic 1336 Invoca_MapaCacic
1327 else if(ActualActivity <> 0) then 1337 else if(ActualActivity <> 0) then
1328 begin 1338 begin
@@ -1334,7 +1344,7 @@ begin @@ -1334,7 +1344,7 @@ begin
1334 MessageDlg(#13#13+'Mapa já está em execução!',mtInformation, [mbOK], 0); 1344 MessageDlg(#13#13+'Mapa já está em execução!',mtInformation, [mbOK], 0);
1335 end 1345 end
1336 else 1346 else
1337 - MessageDlg(#13#13+'M�dulo desabilitado!',mtInformation, [mbOK], 0); 1347 + MessageDlg(#13#13+'Módulo desabilitado ou já coletado!',mtInformation, [mbOK], 0);
1338 end; 1348 end;
1339 1349
1340 //////////////////////////////////////////////////////////////////////////////// 1350 ////////////////////////////////////////////////////////////////////////////////
@@ -1353,7 +1363,9 @@ begin @@ -1353,7 +1363,9 @@ begin
1353 objCacic.writeDailyLog('Invoca_MapaCacic: Criando processo mapa.'); 1363 objCacic.writeDailyLog('Invoca_MapaCacic: Criando processo mapa.');
1354 objCACIC.writeDebugLog('Invoca_MapaCacic: Criando Processo Mapa => "'+objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe'); 1364 objCACIC.writeDebugLog('Invoca_MapaCacic: Criando Processo Mapa => "'+objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe');
1355 if (objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',false,SW_SHOW)) then 1365 if (objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',false,SW_SHOW)) then
1356 - objCacic.writeDailyLog('Invoca_MapaCacic: Processo criado.') 1366 + Begin
  1367 + objCacic.writeDailyLog('Invoca_MapaCacic: Processo criado.');
  1368 + End
1357 else 1369 else
1358 objCacic.writeDailyLog('Invoca_MapaCacic: Falha ao criar processo.'); 1370 objCacic.writeDailyLog('Invoca_MapaCacic: Falha ao criar processo.');
1359 End 1371 End
@@ -1395,7 +1407,6 @@ var v_mensagem, @@ -1395,7 +1407,6 @@ var v_mensagem,
1395 intTentativas : integer; 1407 intTentativas : integer;
1396 begin 1408 begin
1397 try 1409 try
1398 -  
1399 if FindCmdLineSwitch('execute', True) or 1410 if FindCmdLineSwitch('execute', True) or
1400 FindCmdLineSwitch('atualizacao', True) or 1411 FindCmdLineSwitch('atualizacao', True) or
1401 Pode_Coletar or 1412 Pode_Coletar or
@@ -1433,17 +1444,6 @@ begin @@ -1433,17 +1444,6 @@ begin
1433 Application.ProcessMessages; 1444 Application.ProcessMessages;
1434 InicializaTray; 1445 InicializaTray;
1435 1446
1436 - ////////////////////////////////////////////////////////////////////////////////  
1437 - // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //  
1438 - ////////////////////////////////////////////////////////////////////////////////  
1439 - if not FindCmdLineSwitch('atualizacao', True)  
1440 - and not (FileExists(objCacic.getLocalFolderName + 'Temp\aguarde_MAPACACIC.txt'))  
1441 - and (objCACIC.getValueFromFile('Configs', 'Patrimonio', strGerColsInfFileName) = 'true') then  
1442 - begin  
1443 - objCACIC.writeDebugLog('ExecutaCACIC: Executa chamada ao Mapa Cacic...');  
1444 - Invoca_MapaCacic;  
1445 - end;  
1446 -  
1447 // Pausas de 15 segundos para o caso de ser(em) baixada(s) nova(s) vers�o(�es) de GerCols e/ou Cacic280. 1447 // Pausas de 15 segundos para o caso de ser(em) baixada(s) nova(s) vers�o(�es) de GerCols e/ou Cacic280.
1448 // Ser�o 4 tentativas por minuto 1448 // Ser�o 4 tentativas por minuto
1449 // Ser�o 30 minutos no m�ximo de tentativas, totalizando 120 1449 // Ser�o 30 minutos no m�ximo de tentativas, totalizando 120
@@ -1622,7 +1622,7 @@ begin @@ -1622,7 +1622,7 @@ begin
1622 if g_intStatus = EM_SUPORTE then 1622 if g_intStatus = EM_SUPORTE then
1623 v_strHint := v_strHint + chr(13) + chr(10) + ' Em Suporte Remoto...' 1623 v_strHint := v_strHint + chr(13) + chr(10) + ' Em Suporte Remoto...'
1624 else if g_intStatus = COLETANDO then 1624 else if g_intStatus = COLETANDO then
1625 - v_strHint := v_strHint + chr(13) + chr(10) + ' Coletas em Execu��o...'; 1625 + v_strHint := v_strHint + chr(13) + chr(10) + ' Coletas em Execução...';
1626 objCACIC.writeDebugLog('InicializaTray: v_strHint Depois = "'+v_strHint+'"'); 1626 objCACIC.writeDebugLog('InicializaTray: v_strHint Depois = "'+v_strHint+'"');
1627 End; 1627 End;
1628 1628
@@ -1731,7 +1731,7 @@ end; @@ -1731,7 +1731,7 @@ end;
1731 1731
1732 procedure TFormularioGeral.WMQueryEndSession(var Msg: TWMQueryEndSession); 1732 procedure TFormularioGeral.WMQueryEndSession(var Msg: TWMQueryEndSession);
1733 begin 1733 begin
1734 - objCACIC.writeDailyLog('Windows em processo de finaliza��o!'); 1734 + objCACIC.writeDailyLog('Windows em processo de finalização!');
1735 // Quando h� um shutdown do windows em execu��o, libera o close. 1735 // Quando h� um shutdown do windows em execu��o, libera o close.
1736 OnCloseQuery := Nil; 1736 OnCloseQuery := Nil;
1737 Msg.Result := 1; 1737 Msg.Result := 1;
@@ -1960,7 +1960,7 @@ begin @@ -1960,7 +1960,7 @@ begin
1960 st_lb_Etiqueta9.Caption := st_lb_Etiqueta9.Caption + IfThen(st_lb_Etiqueta9.Caption='','',':'); 1960 st_lb_Etiqueta9.Caption := st_lb_Etiqueta9.Caption + IfThen(st_lb_Etiqueta9.Caption='','',':');
1961 st_lb_Etiqueta9.Visible := true; 1961 st_lb_Etiqueta9.Visible := true;
1962 st_vl_etiqueta9.Caption := objCACIC.deCrypt( objCACIC.GetValueFromFile('Patrimonio','TeInfoPatrimonio6', strMainProgramInfFileName)); 1962 st_vl_etiqueta9.Caption := objCACIC.deCrypt( objCACIC.GetValueFromFile('Patrimonio','TeInfoPatrimonio6', strMainProgramInfFileName));
1963 - end 1963 + end
1964 else 1964 else
1965 Begin 1965 Begin
1966 st_lb_Etiqueta9.Visible := false; 1966 st_lb_Etiqueta9.Visible := false;