From db70e74db311af214cc88fe8108d61eba7b3d799 Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Mon, 4 Oct 2010 14:02:27 +0000
Subject: [PATCH] 2010-10-04  Ramon Novoa  <rnovoa@artica.es>

	* modules/pandora_module_inventory.cc: Fixed XML generation for
	  inventory modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_agents/win32/ChangeLog                |  5 +++++
 .../win32/modules/pandora_module_inventory.cc | 19 +++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index f57cef7ca0..df2435f8d3 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-04  Ramon Novoa  <rnovoa@artica.es>
+
+	* modules/pandora_module_inventory.cc: Fixed XML generation for
+	  inventory modules.
+
 2010-08-04  Ramon Novoa  <rnovoa@artica.es>
 
 	* Makefile.am: Use -static-libstdc++ to remove the dependency on
diff --git a/pandora_agents/win32/modules/pandora_module_inventory.cc b/pandora_agents/win32/modules/pandora_module_inventory.cc
index e399096c76..022d5e9a34 100644
--- a/pandora_agents/win32/modules/pandora_module_inventory.cc
+++ b/pandora_agents/win32/modules/pandora_module_inventory.cc
@@ -338,18 +338,17 @@ Pandora_Module_Inventory::getXml() {
 				module_xml +=  "]]></type>\n";
 		
 				module_xml += "\t\t\t<datalist>\n";
-		    } else {
-				try {
-					data_clean = strreplace (this->getDataOutput (data),
-					                         "%", "%%" );
-				} catch (Output_Error e) {
-					continue;
-				}
+		    }
 
-				module_xml += "\t\t\t\t<data><![CDATA[";
-				module_xml += data_clean;
-				module_xml += "]]></data>\n";
+			try {
+				data_clean = strreplace (this->getDataOutput (data), "%", "%%" );
+			} catch (Output_Error e) {
+				continue;
 			}
+
+			module_xml += "\t\t\t\t<data><![CDATA[";
+			module_xml += data_clean;
+			module_xml += "]]></data>\n";
 			
 			prev_module = current_module;
 		}