api06: Move version-checking into the models, raising an exception on mismatch

[rails.git] / app / controllers / way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index d3a1b039f557b2afc129f050106b5282db23b897..b22d35d0bfdb393f9bd7d5a854d181b1646bf761 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -49,11 +49,6 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
-      if new_way.version != way.version
-        render :text => "Version mismatch: Provided " + new_way.version.to_s + ", server had: " + way.version.to_s, :status => :bad_request
-        return
-      end  
-        
 
       if new_way and new_way.id == way.id
         way.update_from(new_way, @user)
@@ -63,6 +58,9 @@ class WayController < ApplicationController
       end
     rescue OSM::APIPreconditionFailedError
       render :text => "", :status => :precondition_failed
+    rescue OSM::APIVersionMismatchError => ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end