deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@redhat.com
Subject [PATCH] CIMI - slight hack to prefer content_type of xml when CIMI frontend is being used (and client specifies this as accepted type)
Date Tue, 13 Mar 2012 16:17:14 GMT
From: marios <marios@redhat.com>

HTML views for CIMI are being phased out...

Signed-off-by: marios <marios@redhat.com>
---
 server/lib/sinatra/rack_accept.rb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/lib/sinatra/rack_accept.rb b/server/lib/sinatra/rack_accept.rb
index b576307..0f179ea 100644
--- a/server/lib/sinatra/rack_accept.rb
+++ b/server/lib/sinatra/rack_accept.rb
@@ -77,9 +77,13 @@ module Rack
             self[type] = handler
           end
           yield wants
-          @media_type = accepting_formats.to_a.sort { |a,b| a[1]<=>b[1] }.reverse.select
do |format, priority|
-            wants.keys.include?(format) == true
-          end.first
+          if ENV['API_FRONTEND'] == "cimi"
+            @media_type = (accepting_formats.has_key?(:xml) ? [:xml, accepting_formats[:xml]]
: nil)
+          else
+            @media_type ||= accepting_formats.to_a.sort { |a,b| a[1]<=>b[1] }.reverse.select
do |format, priority|
+              wants.keys.include?(format) == true
+            end.first
+          end
           if @media_type and @media_type[0]
             @media_type = @media_type[0]
             headers 'Content-Type' => Rack::MediaType::ACCEPTED_MEDIA_TYPES[@media_type][:return]
-- 
1.7.6.5


Mime
View raw message