Download as
Browse Code »

Commit 325b7b3ff31e9790e523ef51c8d7ed8024980058

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

Versão 2.1.8.22: 

Correção de bug ao reescrever CollectDefinitions.
Correção de bug do timer.
Acréscimo da classe isNotebook na coleta de hardware.
Showing 15 changed files with 19 additions and 13 deletions   Show diff stats
CACIC_Library.pas
  Diff comments   View file @325b7b3
@@ -763,6 +763,7 @@ begin @@ -763,6 +763,7 @@ begin
763 FileSetAttr(pStrFileName, FileGetAttr(pStrFileName) xor faReadOnly); 763 FileSetAttr(pStrFileName, FileGetAttr(pStrFileName) xor faReadOnly);
764 764
765 InfFile := TIniFile.Create(pStrFileName); 765 InfFile := TIniFile.Create(pStrFileName);
  766 + InfFile.DeleteKey(pStrSectionName, pStrKeyName);
766 InfFile.WriteString(pStrSectionName, pStrKeyName, pStrValue); 767 InfFile.WriteString(pStrSectionName, pStrKeyName, pStrValue);
767 InfFile.Free; 768 InfFile.Free;
768 end; 769 end;
Mapa/mapacacic.dproj
  Diff comments   View file @325b7b3
@@ -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">21</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.21</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">22</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.22</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 @325b7b3
No preview for this file type
cacic280.dproj
  Diff comments   View file @325b7b3
@@ -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">21</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.21</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">22</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.22</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 @325b7b3
No preview for this file type
cacicservice/cacicservice.dproj
  Diff comments   View file @325b7b3
@@ -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">21</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.21</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">22</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.22</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 @325b7b3
No preview for this file type
chksis/chksis.dproj
  Diff comments   View file @325b7b3
@@ -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">21</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.21</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">22</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.22</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 @325b7b3
No preview for this file type
gercols/gercols.dpr
  Diff comments   View file @325b7b3
@@ -9,14 +9,14 @@ publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença, ou (na @@ -9,14 +9,14 @@ publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença, ou (na
9 9
10 Este programa é distribuido na esperança que possa ser util, mas SEM NENHUMA GARANTIA; sem uma garantia implicita de ADEQUAÇÂO a qualquer 10 Este programa é distribuido na esperança que possa ser util, mas SEM NENHUMA GARANTIA; sem uma garantia implicita de ADEQUAÇÂO a qualquer
11 MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes. 11 MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU para maiores detalhes.
12 - 12 + F
13 Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software 13 Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título "LICENCA.txt", junto com este programa, se não, escreva para a Fundação do Software
14 Livre(FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 14 Livre(FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15 15
16 NOTA: O componente MiTeC System Information Component (MSIC) é baseado na classe TComponent e contém alguns subcomponentes baseados na classe TPersistent 16 NOTA: O componente MiTeC System Information Component (MSIC) é baseado na classe TComponent e contém alguns subcomponentes baseados na classe TPersistent
17 Este componente é apenas freeware e não open-source, e foi baixado de http://www.mitec.cz/Downloads/MSIC.zip 17 Este componente é apenas freeware e não open-source, e foi baixado de http://www.mitec.cz/Downloads/MSIC.zip
18 --------------------------------------------------------------------------------------------------------------------------------------------------------------- 18 ---------------------------------------------------------------------------------------------------------------------------------------------------------------
19 -*) 19 +*)
20 20
21 program gercols; 21 program gercols;
22 {$R *.res} 22 {$R *.res}
@@ -242,6 +242,7 @@ Begin @@ -242,6 +242,7 @@ Begin
242 242
243 if (strRetorno <> '0') Then 243 if (strRetorno <> '0') Then
244 Begin 244 Begin
  245 + objCacic.setValueToFile('Configs', 'CollectsDefinitions', '', strGercolsInfFileName);
245 objCacic.setBoolCipher(not objCacic.isInDebugMode); 246 objCacic.setBoolCipher(not objCacic.isInDebugMode);
246 objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName); 247 objCacic.setValueToFile('Configs','ConexaoOK','S', strGerColsInfFileName);
247 248
@@ -974,7 +975,6 @@ Begin @@ -974,7 +975,6 @@ Begin
974 strAcaoGercols := 'GerCols invocado para coletas...'; 975 strAcaoGercols := 'GerCols invocado para coletas...';
975 intTotalExecutedCollects := 0; 976 intTotalExecutedCollects := 0;
976 intTotalSendedCollects := 0; 977 intTotalSendedCollects := 0;
977 - objCacic.setValueToFile('Configs', 'CollectsDefinitions', '', strGercolsInfFileName);  
978 getConfigs(true); 978 getConfigs(true);
979 979
980 // Abaixo eu testo se existe um endereço configurado para não disparar os procedimentos de coleta em vão. 980 // Abaixo eu testo se existe um endereço configurado para não disparar os procedimentos de coleta em vão.
@@ -1143,7 +1143,8 @@ Begin @@ -1143,7 +1143,8 @@ Begin
1143 tstrColetaHardware := 'Sim' 1143 tstrColetaHardware := 'Sim'
1144 else 1144 else
1145 tstrColetaHardware := 'Nao'; 1145 tstrColetaHardware := 'Nao';
1146 - strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Notebook=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware))); 1146 +
  1147 + strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',isNotebook=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware)));
1147 // strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Impressora=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware))); 1148 // strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Impressora=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware)));
1148 1149
1149 // Adiciona variáveis da coleta de hardware na requisição 1150 // Adiciona variáveis da coleta de hardware na requisição
gercols/gercols.dproj
  Diff comments   View file @325b7b3
@@ -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">21</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.21</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">22</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.22</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 @325b7b3
No preview for this file type
installcacic/installcacic.dproj
  Diff comments   View file @325b7b3
@@ -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">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> 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">22</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.22</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 @325b7b3
No preview for this file type
@@ -1321,11 +1321,13 @@ begin @@ -1321,11 +1321,13 @@ begin
1321 else 1321 else
1322 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); 1322 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);
1323 1323
  1324 + //garantir que os dados sejam salvos
  1325 + sleep (5000);
1324 g_intStatus := 1; 1326 g_intStatus := 1;
1325 objCacic.setBoolCipher(not objCacic.isInDebugMode); 1327 objCacic.setBoolCipher(not objCacic.isInDebugMode);
1326 End 1328 End
1327 else 1329 else
1328 - objCACIC.writeDailyLog('N�o foi poss�vel invocar o Gerente de Coletas!'); 1330 + objCACIC.writeDailyLog('Não foi possível invocar o Gerente de Coletas!');
1329 End; 1331 End;
1330 end; 1332 end;
1331 1333
@@ -1434,7 +1436,7 @@ begin @@ -1434,7 +1436,7 @@ begin
1434 SetaVariaveisGlobais; 1436 SetaVariaveisGlobais;
1435 End; 1437 End;
1436 1438
1437 - objCACIC.writeDailyLog('Iniciando execu��o de atividades.'); 1439 + objCACIC.writeDailyLog('Iniciando execução de atividades.');
1438 1440
1439 objCACIC.writeDebugLog('ExecutaCACIC: Primeira chamada ao Gerente de Coletas...'); 1441 objCACIC.writeDebugLog('ExecutaCACIC: Primeira chamada ao Gerente de Coletas...');
1440 Invoca_GerCols('getConfigs'); 1442 Invoca_GerCols('getConfigs');
@@ -2341,9 +2343,11 @@ procedure TFormularioGeral.CheckForcaColetaTimer(Sender: TObject); @@ -2341,9 +2343,11 @@ procedure TFormularioGeral.CheckForcaColetaTimer(Sender: TObject);
2341 begin 2343 begin
2342 Invoca_GerCols('getTest'); 2344 Invoca_GerCols('getTest');
2343 if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') or 2345 if (objCACIC.getValueFromFile('Configs', 'forca_coleta', strGerColsInfFileName) = 'S') or
2344 - (objCACIC.GetValueFromFile('Configs','ConexaoOK', strGerColsInfFileName) <> 'S') then 2346 + not (objCACIC.getValueFromFile('Configs', 'ConexaoOK' , strGerColsInfFileName) = 'S') then
  2347 + begin
2345 objCACIC.deleteFileOrFolder(objCACIC.getLocalFolderName + 'Temp\ck_conexao.ini'); 2348 objCACIC.deleteFileOrFolder(objCACIC.getLocalFolderName + 'Temp\ck_conexao.ini');
2346 FormularioGeral.ExecutaCACIC(nil); 2349 FormularioGeral.ExecutaCACIC(nil);
  2350 + end;
2347 end; 2351 end;
2348 2352
2349 procedure TFormularioGeral.CheckIfDownloadedVersion; 2353 procedure TFormularioGeral.CheckIfDownloadedVersion;