if !relation.preconditions_ok?
render :text => "", :status => :precondition_failed
else
- relation.version = 0
- relation.user_id = @user.id
+ relation.version = 0
+ #relation.user_id = @user.id
relation.save_with_history!
- render :text => relation.id.to_s, :content_type => "text/plain"
+ render :text => relation.id.to_s, :content_type => "text/plain"
end
else
render :nothing => true, :status => :bad_request
begin
relation = Relation.find(params[:id])
new_relation = Relation.from_xml(request.raw_post)
- if new_relation.version != relation.version
- render :text => "Version mismatch: Provided " + new_relation.version.to_s + ", server had: " + relation.version.to_s, :status => :bad_request
- return
- end
if new_relation and new_relation.id == relation.id
- relation.update_from new_relation, user
+ relation.update_from new_relation, @user
render :text => relation.version.to_s, :content_type => "text/plain"
else
render :nothing => true, :status => :bad_request
end
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
- rescue OSM::APIPreconditionFailedError
- render :text => "", :status => :precondition_failed
- rescue
- render :nothing => true, :status => :internal_server_error
+ rescue OSM::APIError => ex
+ render ex.render_opts
end
end
begin
relation = Relation.find(params[:id])
relation.delete_with_history(@user)
- rescue OSM::APIAlreadyDeletedError
- render :text => "", :status => :gone
- rescue OSM::APIPreconditionFailedError
- render :text => "", :status => :precondition_failed
+ rescue OSM::APIError => ex
+ render ex.render_opts
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
- rescue
- render :nothing => true, :status => :internal_server_error
end
end