From a053cf9a532243ba5038a7cdeaad698653c57588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Tue, 17 May 2011 16:51:26 +0200 Subject: [PATCH] Added comments to retrieve_element function --- src/oca/ruby/OpenNebula/XMLUtils.rb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/oca/ruby/OpenNebula/XMLUtils.rb b/src/oca/ruby/OpenNebula/XMLUtils.rb index 506bd6a2a7..19c6795df1 100644 --- a/src/oca/ruby/OpenNebula/XMLUtils.rb +++ b/src/oca/ruby/OpenNebula/XMLUtils.rb @@ -102,20 +102,27 @@ module OpenNebula end end + # Gets an array of text from elemenets extracted + # using the XPATH expression passed as filter def retrieve_elements(filter) - ids_array = Array.new + elements_array = Array.new if NOKOGIRI - @xml.xpath(filter).each { |pelem| - ids_array << pelem.text + @xml.xpath(filter.to_s).each { |pelem| + elements_array << pelem.text if !pelem.text } else - @xml.elements.each(filter) { |pelem| - ids_array << pelem.text + @xml.elements.each(filter.to_s) { |pelem| + elements_array << pelem.text if !pelem.text } end - return ids_array + if elements_array.size == 0 + return nil + else + return elements_array + end + end # Gets an attribute from an elemenT