shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

bug #381: Fix REXML XML formatting compatibility with ruby 1.8.5

Browse Source
This commit is contained in:
Daniel Molina 2010-11-18 17:38:37 +01:00
parent d37c50a6d1
commit 8d2cab1c43
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/oca/ruby/OpenNebula/XMLUtils.rb
View File

@ -7,6 +7,13 @@ module OpenNebula
rescue LoadError
NOKOGIRI=false
end
begin
require 'rexml/formatters/default'
REXML_FORMATTERS=true
rescue LoadError
REXML_FORMATTERS=false
end
###########################################################################
# The XMLElement class provides an abstraction of the underlying
@ -176,17 +183,18 @@ module OpenNebula
end
def to_xml(pretty=false)
if NOKOGIRI
@xml.to_xml
if NOKOGIRI && pretty
str = @xml.to_xml
elsif REXML_FORMATTERS && pretty
str = String.new
formatter = REXML::Formatters::Pretty.new
formatter.compact = true
str = formatter.write(@xml,str)
else
str = ""
if pretty
REXML::Formatters::Pretty.new(1).write(@xml,str)
else
REXML::Formatters::Default.new.write(@xml,str)
end
str
str = @xml.to_s
end
return str
end
end