From b0915fe9d9d19a6bc4b3588814305d7c31a4e90b Mon Sep 17 00:00:00 2001
From: eduardo.santos <eduardo.edusantos@gmail.com>
Date: Tue, 10 Sep 2013 21:31:27 +0000
Subject: [PATCH] Versáo do agente que implementa a coleta de software

---
 Grupo_CACIC.groupproj | 15 ++++++++++++---
 gercols/gercols.dpr   | 30 +++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/Grupo_CACIC.groupproj b/Grupo_CACIC.groupproj
index 2c7a38b..f0d526b 100644
--- a/Grupo_CACIC.groupproj
+++ b/Grupo_CACIC.groupproj
@@ -73,13 +73,22 @@
   <Target Name="CacicVersionsAndHashes:Make">
     <MSBuild Projects="CacicVersionsAndHashes\CacicVersionsAndHashes.dproj" Targets="Make" />
   </Target>
+  <Target Name="TesteSoftware">
+    <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="" />
+  </Target>
+  <Target Name="TesteSoftware:Clean">
+    <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TesteSoftware:Make">
+    <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACIC;CacicVersionsAndHashes" />
+    <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACIC;CacicVersionsAndHashes;TesteSoftware" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACIC:Clean;CacicVersionsAndHashes:Clean" />
+    <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACIC:Clean;CacicVersionsAndHashes:Clean;TesteSoftware:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACIC:Make;CacicVersionsAndHashes:Make" />
+    <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACIC:Make;CacicVersionsAndHashes:Make;TesteSoftware:Make" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/gercols/gercols.dpr b/gercols/gercols.dpr
index a9dee23..d3cab71 100644
--- a/gercols/gercols.dpr
+++ b/gercols/gercols.dpr
@@ -617,7 +617,8 @@ begin
       Try
         Registry.GetKeyNames(SubKeys);
         // Abre a tag com o nome da chave
-        saida := '[SoftwareList]';
+        //saida := '[SoftwareList]';
+        saida := '';
 
         // Adiciona o pai
         SubRegistry.RootKey := HKEY_LOCAL_MACHINE;
@@ -650,7 +651,7 @@ begin
         end;
 
         // Fecha a tag do software
-        saida := saida + '[/SoftwareList]';
+        //saida := saida + '[/SoftwareList]';
       Finally
         SubKeys.Free;
       End;
@@ -933,6 +934,13 @@ Begin
                                                                        '[ActivityStatus]'   + Trim(strInAtivo)         + '[/ActivityStatus]',',','[[COMMA]]',[rfReplaceAll]);
 
                                        strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',AntiVirus='  + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(strColetaAtual));
+
+                                       objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
+                                       tstrColetaSoftware := SoftwareList;
+
+                                       // Adiciona variáveis da coleta de software na requisição
+                                       strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',SoftwareList=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaSoftware)));
+
                                     Except
                                      on E : Exception do
                                        Begin
@@ -1393,6 +1401,14 @@ Begin
                                       strColetaAtual := StringReplace(strColetaAtual,',','[[COMMA]]',[rfReplaceAll]);
 
                                       strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',MonitoredProfiles=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(strColetaAtual));
+
+                                      // Adiciona coleta de software
+                                      objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
+                                      tstrColetaSoftware := SoftwareList;
+
+                                      // Adiciona variáveis da coleta de software na requisição
+                                      strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',SoftwareList=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaSoftware)));
+
                                     Except
                                       Begin
                                         objCacic.setValueToFile('Collects',tstringsActions[intLoopActions] + '_End'   ,'99999999', strGerColsInfFileName);
@@ -1424,9 +1440,6 @@ Begin
                                       Inc(intTotalExecutedCollects);
                                       strClassesAndProperties := objCacic.getValueFromTags('ClassesAndProperties',strActionDefinition);
 
-                                      objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
-                                      tstrColetaSoftware := SoftwareList;
-
                                       objCacic.writeDebugLog('executeGerCols: strClassesAndProperties -> "' + strClassesAndProperties + '"');
                                       tstringsClasses    := objCacic.explode(objCacic.getValueFromTags('Classes',strClassesAndProperties),',');
 
@@ -1436,6 +1449,13 @@ Begin
                                           strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',' + tstringsClasses[intLoopClasses] + '=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(fetchWmiValues('Win32_' + tstringsClasses[intLoopClasses],objCacic.getLocalFolderName, objCacic.getValueFromTags(tstringsClasses[intLoopClasses] + '.Properties',strClassesAndProperties),objCacic.getValueFromTags(tstringsClasses[intLoopClasses] + '.WhereClause',strClassesAndProperties)))));
                                         End;
 
+                                      // Adiciona coleta de software
+                                      objCacic.writeDebugLog('executeGerCols: Executando coleta de Software -> ');
+                                      tstrColetaSoftware := SoftwareList;
+
+                                      // Adiciona variáveis da coleta de software na requisição
+                                      strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',SoftwareList=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt(objCacic.replaceInvalidHTTPChars(tstrColetaSoftware)));
+
                                       strColetaAtual := strFieldsAndValuesToRequest;
                                     Except
                                      on E : Exception do
--
libgit2 0.21.2