Commit 8f3540fa74b7771044263d9018c5b1a9b81b5841
1 parent
950a09c2
Exists in
master
Alterações gercols: Limpando o CollectsDefinitions antes de gravar outro, pois a…
…parentemente estava duplicando. Adicionada tag "Notebook" no envio de hardware, sendo atribuido "sim" ou "nao", caso seja, ou não, notebook. Alterações Mapa: Troca de alguns dailylogs para debugLogs. Demais módulos, apenas versão trocada.
Showing
13 changed files
with
25 additions
and
16 deletions
Show diff stats
Mapa/Mapa.pas
| ... | ... | @@ -302,7 +302,7 @@ var |
| 302 | 302 | teste : string; |
| 303 | 303 | Begin |
| 304 | 304 | btCombosUpdate.Enabled := false; |
| 305 | - objCACIC.writeDailyLog('getConfigs: Invocando getConfigs...'); | |
| 305 | + objCACIC.writeDebugLog('getConfigs: Invocando getConfigs...'); | |
| 306 | 306 | Result := Comm(objCacic.getWebManagerAddress + objCacic.getWebServicesFolderName + 'get/config', strFieldsAndValuesToRequest, objCacic.getLocalFolderName); |
| 307 | 307 | |
| 308 | 308 | objCacic.setBoolCipher(not objCacic.isInDebugMode); |
| ... | ... | @@ -310,7 +310,7 @@ Begin |
| 310 | 310 | |
| 311 | 311 | if (Result <> '0') then |
| 312 | 312 | Begin |
| 313 | - objCACIC.writeDailyLog('getConfigs: Comunicação realizada com sucesso!'); | |
| 313 | + objCACIC.writeDebugLog('getConfigs: Comunicação realizada com sucesso!'); | |
| 314 | 314 | objCacic.setValueToFile('Configs' ,'servidor_autenticacao', objCacic.getValueFromTags('dados_ldap' , Result), strGerColsInfFileName); |
| 315 | 315 | objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName); |
| 316 | 316 | objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName); |
| ... | ... | @@ -329,7 +329,7 @@ End; |
| 329 | 329 | procedure TfrmMapaCacic.RecuperaValoresAnteriores; |
| 330 | 330 | var strCollectsPatrimonioLast : String; |
| 331 | 331 | begin |
| 332 | - objCACIC.writeDailyLog('RecuperaValoresAnteriores: Início.'); | |
| 332 | + objCACIC.writeDebugLog('RecuperaValoresAnteriores: Início.'); | |
| 333 | 333 | btCombosUpdate.Enabled := false; |
| 334 | 334 | |
| 335 | 335 | strCollectsPatrimonioLast := objCacic.deCrypt( objCacic.GetValueFromFile |
| ... | ... | @@ -375,7 +375,7 @@ begin |
| 375 | 375 | End; |
| 376 | 376 | btCombosUpdate.Enabled := true; |
| 377 | 377 | Application.ProcessMessages; |
| 378 | - objCACIC.writeDailyLog('RecuperaValoresAnteriores: Fim.'); | |
| 378 | + objCACIC.writeDebugLog('RecuperaValoresAnteriores: Fim.'); | |
| 379 | 379 | end; |
| 380 | 380 | |
| 381 | 381 | procedure TfrmMapaCacic.AtualizaPatrimonio(Sender: TObject); |
| ... | ... | @@ -386,7 +386,7 @@ if edTeInfoPatrimonio5.text <> '' then |
| 386 | 386 | begin |
| 387 | 387 | btGravarInformacoes.Enabled := false; |
| 388 | 388 | btGravarInformacoes.Caption := 'Enviando informações...'; |
| 389 | - objCACIC.writeDailyLog('Preparando para o envio das informações...'); | |
| 389 | + objCACIC.writeDebugLog('Preparando para o envio das informações...'); | |
| 390 | 390 | strFieldsAndValuesToRequest := 'CollectType=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt('col_patr')) ; |
| 391 | 391 | |
| 392 | 392 | strColetaAtual := StringReplace('[IDPatrimonio]' + edTeInfoPatrimonio1.Text + '[/IDPatrimonio]' + |
| ... | ... | @@ -571,7 +571,7 @@ Begin |
| 571 | 571 | btGravarInformacoes.Visible := true; |
| 572 | 572 | btCombosUpdate.Enabled := true; |
| 573 | 573 | Application.ProcessMessages; |
| 574 | - objCACIC.writeDailyLog('Interface criada com sucesso.'); | |
| 574 | + objCACIC.writeDebugLog('Interface criada com sucesso.'); | |
| 575 | 575 | end; |
| 576 | 576 | |
| 577 | 577 | procedure TfrmMapaCacic.FormClose(Sender: TObject; var Action: TCloseAction); |
| ... | ... | @@ -681,7 +681,7 @@ begin |
| 681 | 681 | 'Patrimonio', |
| 682 | 682 | strGerColsInfFileName) = 'true') then |
| 683 | 683 | begin |
| 684 | - objCACIC.writeDailyLog('Iniciando formulário.'); | |
| 684 | + objCACIC.writeDebugLog('Iniciando formulário.'); | |
| 685 | 685 | mapa; |
| 686 | 686 | FormSetFocus(foco) |
| 687 | 687 | end |
| ... | ... | @@ -937,7 +937,7 @@ begin |
| 937 | 937 | begin |
| 938 | 938 | try |
| 939 | 939 | try |
| 940 | - objCACIC.writeDailyLog('Nome Usuário: Estabelecendo conexão.'); | |
| 940 | + objCACIC.writeDebugLog('Nome Usuário: Estabelecendo conexão.'); | |
| 941 | 941 | ldap.TargetHost := host; |
| 942 | 942 | ldap.UserName := username; |
| 943 | 943 | ldap.Password := psswd; |
| ... | ... | @@ -946,7 +946,7 @@ begin |
| 946 | 946 | begin |
| 947 | 947 | ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio4, retorno); //Faz a pesquisa, com o CPF repassado. |
| 948 | 948 | result := LDAPResultdump(ldap.SearchResult); |
| 949 | - objCACIC.writeDailyLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.'); | |
| 949 | + objCACIC.writeDebugLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.'); | |
| 950 | 950 | ldap.Logout; |
| 951 | 951 | end; |
| 952 | 952 | finally | ... | ... |
Mapa/Source/synsock.pas
Mapa/mapacacic.dproj
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 25 | 25 | <Borland.ProjectType /> |
| 26 | 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">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> | |
| 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> | |
| 28 | 28 | </ProjectExtensions> |
| 29 | 29 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 30 | 30 | <ItemGroup> | ... | ... |
Mapa/mapacacic.res
No preview for this file type
cacic280.dproj
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 41 | 41 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 42 | 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">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> | |
| 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> | |
| 44 | 44 | </ProjectExtensions> |
| 45 | 45 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 46 | 46 | <ItemGroup> | ... | ... |
cacic280.res
No preview for this file type
cacicservice/cacicservice.dproj
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 38 | 38 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 39 | 39 | <BorlandProject> |
| 40 | -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">E:\NTService\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">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> | |
| 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> | |
| 41 | 41 | </ProjectExtensions> |
| 42 | 42 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 43 | 43 | <ItemGroup> | ... | ... |
cacicservice/cacicservice.res
No preview for this file type
chksis/chksis.dproj
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 30 | 30 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 31 | 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">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> | |
| 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> | |
| 33 | 33 | </ProjectExtensions> |
| 34 | 34 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 35 | 35 | <ItemGroup> | ... | ... |
chksis/chksis.res
No preview for this file type
gercols/gercols.dpr
| ... | ... | @@ -811,6 +811,8 @@ begin |
| 811 | 811 | outString := outString + fetchWmiValues('Win32_PhysicalMemory', 'BankLabel,Capacity,Caption,DataWidth,Description,DeviceLocator,FormFactor,InstallDate,InterleaveDataDepth,InterleavePosition,Manufacturer,MemoryType,Model,Name,OtherIdentifyingInfo,PartNumber,PositionInRow,' + 'SerialNumber,SKU,Speed,Tag,TotalWidth,TypeDetail,Version', objCacic.getLocalFolderName); |
| 812 | 812 | outString := outString + fetchWmiValues('Win32_Processor', 'AddressWidth,Architecture,Availability,Caption,CreationClassName,DataWidth,Description,DeviceID,ExtClock,Family,InstallDate,L2CacheSize,L2CacheSpeed,L3CacheSize,L3CacheSpeed,Level,LoadPercentage,Manufacturer,'+ 'MaxClockSpeed,Name,NumberOfCores,NumberOfLogicalProcessors,OtherFamilyDescription,PNPDeviceID,ProcessorId,ProcessorType,Revision,Role,SocketDesignation,SystemName,UniqueId,UpgradeMethod,Version,VoltageCaps', objCacic.getLocalFolderName); |
| 813 | 813 | outString := outString + fetchWmiValues('Win32_Printer', 'Attributes,Availability,Caption,CharSetsSupported,Comment,CurrentCharSet,Default,Description,DeviceID,Direct,DriverName,HorizontalResolution,InstallDate,JobCountSinceLastReset,KeepPrintedJobs,LanguagesSupported,' + 'Local,Location,MarkingTechnology,MaxCopies,MaxNumberUp,MaxSizeSupported,MimeTypesSupported,Name,Network,PaperSizesSupported,PaperTypesAvailable,Parameters,PNPDeviceID,PortName,PrintProcessor,' + 'ServerName,Shared,ShareName,SpoolEnabled,SystemName,VerticalResolution,WorkOffline', objCacic.getLocalFolderName); |
| 814 | + if getOneValue('Win32_PortableBattery', 'BatteryStatus') <> '' then | |
| 815 | + outString:= outString + '[Notebook]Sim[/Notebook]'; | |
| 814 | 816 | |
| 815 | 817 | // Retorna uma string com todas as coletas |
| 816 | 818 | Result := outString; |
| ... | ... | @@ -972,7 +974,7 @@ Begin |
| 972 | 974 | strAcaoGercols := 'GerCols invocado para coletas...'; |
| 973 | 975 | intTotalExecutedCollects := 0; |
| 974 | 976 | intTotalSendedCollects := 0; |
| 975 | - | |
| 977 | + objCacic.setValueToFile('Configs', 'CollectsDefinitions', '', strGercolsInfFileName); | |
| 976 | 978 | getConfigs(true); |
| 977 | 979 | |
| 978 | 980 | // Abaixo eu testo se existe um endereço configurado para não disparar os procedimentos de coleta em vão. |
| ... | ... | @@ -1135,6 +1137,13 @@ Begin |
| 1135 | 1137 | |
| 1136 | 1138 | tstrColetaHardware := fetchWmiValues('Win32_Printer', objCacic.getLocalFolderName, 'Attributes,Availability,Caption,CharSetsSupported,Comment,CurrentCharSet,Default,Description,DeviceID,Direct,DriverName,HorizontalResolution,InstallDate,JobCountSinceLastReset,KeepPrintedJobs,LanguagesSupported,' + 'Local,Location,MarkingTechnology,MaxCopies,MaxNumberUp,MaxSizeSupported,MimeTypesSupported,Name,Network,PaperSizesSupported,PaperTypesAvailable,Parameters,PNPDeviceID,PortName,PrintProcessor,' + 'ServerName,Shared,ShareName,SpoolEnabled,SystemName,VerticalResolution,WorkOffline'); |
| 1137 | 1139 | strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Win32_Printer=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware))); |
| 1140 | + | |
| 1141 | + tstrColetaHardware := getOneValue('Win32_PortableBattery', 'BatteryStatus'); | |
| 1142 | + if tstrColetaHardware <> '' then | |
| 1143 | + tstrColetaHardware := 'Sim' | |
| 1144 | + else | |
| 1145 | + tstrColetaHardware := 'Nao'; | |
| 1146 | + strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Notebook=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware))); | |
| 1138 | 1147 | // strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Impressora=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaHardware))); |
| 1139 | 1148 | |
| 1140 | 1149 | // Adiciona variáveis da coleta de hardware na requisição | ... | ... |
gercols/gercols.dproj
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | <Borland.Personality>Delphi.Personality</Borland.Personality> |
| 39 | 39 | <Borland.ProjectType>VCLApplication</Borland.ProjectType> |
| 40 | 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">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> | |
| 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> | |
| 42 | 42 | </ProjectExtensions> |
| 43 | 43 | <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> |
| 44 | 44 | <ItemGroup> | ... | ... |
gercols/gercols.res
No preview for this file type