X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f07819d81a7437e58c6e64c2e76ba7e54fad9034..e37a9ec0b52ead11543660ca45fee33c7f7bb1d7:/app/controllers/application_controller.rb?ds=sidebyside

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6c32b74b2..bc71f275f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -134,8 +134,7 @@ class ApplicationController < ActionController::Base
 
   def check_api_readable
     if STATUS == :database_offline or STATUS == :api_offline
-      response.headers['Error'] = "Database offline for maintenance"
-      render :nothing => true, :status => :service_unavailable
+      report_error "Database offline for maintenance", :service_unavailable
       return false
     end
   end
@@ -143,16 +142,14 @@ class ApplicationController < ActionController::Base
   def check_api_writable
     if STATUS == :database_offline or STATUS == :database_readonly or
        STATUS == :api_offline or STATUS == :api_readonly
-      response.headers['Error'] = "Database offline for maintenance"
-      render :nothing => true, :status => :service_unavailable
+      report_error "Database offline for maintenance", :service_unavailable
       return false
     end
   end
 
   def require_public_data
     unless @user.data_public?
-      response.headers['Error'] = "You must make your edits public to upload new data"
-      render :nothing => true, :status => :forbidden
+      report_error "You must make your edits public to upload new data", :forbidden
       return false
     end
   end
@@ -165,7 +162,18 @@ class ApplicationController < ActionController::Base
   def report_error(message, status = :bad_request)
     # Todo: some sort of escaping of problem characters in the message
     response.headers['Error'] = message
-    render :text => message, :status => status
+
+    if request.headers['X-Error-Format'] and
+       request.headers['X-Error-Format'].downcase == "xml"
+      result = OSM::API.new.get_xml_doc
+      result.root.name = "osmError"
+      result.root << (XML::Node.new("status") << interpret_status(status))
+      result.root << (XML::Node.new("message") << message)
+
+      render :text => result.to_s, :content_type => "text/xml"
+    else
+      render :text => message, :status => status
+    end
   end
   
   def set_locale