Prepare for Rails 2.1+, as we will no longer be able to use a symbol in the set_fixtu...

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index c49ecd4d701733b035271a922e3466c40bba0881..da5129467ff1e72caba2f35da5815804eb285008 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -8,24 +8,21 @@ class RelationController < ApplicationController
   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create

-    if request.put?
-      relation = Relation.from_xml(request.raw_post, true)
+    begin
+      if request.put?
+        relation = Relation.from_xml(request.raw_post, true)

 
 

-      if relation
-        if !relation.preconditions_ok?
-          render :text => "", :status => :precondition_failed
+        if relation
+          relation.create_with_history @user
+          render :text => relation.id.to_s, :content_type => "text/plain"

         else
         else

-         relation.version = 0
-          relation.user_id = @user.id
-          relation.save_with_history!
-
-         render :text => relation.id.to_s, :content_type => "text/plain"
+          render :nothing => true, :status => :bad_request

         end
       else
         end
       else

-        render :nothing => true, :status => :bad_request
+        render :nothing => true, :status => :method_not_allowed

       end
       end

-    else
-      render :nothing => true, :status => :method_not_allowed
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
     end
   end
 


@@ -46,12 +43,13 @@ class RelationController < ApplicationController
   end
 
   def update
   end
 
   def update

+    logger.debug request.raw_post

     begin
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
       if new_relation and new_relation.id == relation.id
     begin
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
       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
         render :text => relation.version.to_s, :content_type => "text/plain"
       else
         render :nothing => true, :status => :bad_request


@@ -67,7 +65,13 @@ class RelationController < ApplicationController
 #XXX check if member somewhere!
     begin
       relation = Relation.find(params[:id])
 #XXX check if member somewhere!
     begin
       relation = Relation.find(params[:id])

-      relation.delete_with_history(@user)
+      new_relation = Relation.from_xml(request.raw_post)
+      if new_relation and new_relation.id == relation.id
+        relation.delete_with_history!(new_relation, @user)
+        render :text => relation.version.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request
+      end

     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound
     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound


@@ -181,7 +185,7 @@ class RelationController < ApplicationController
     doc = OSM::API.new.get_xml_doc
 
     Relation.find(relationids).each do |relation|
     doc = OSM::API.new.get_xml_doc
 
     Relation.find(relationids).each do |relation|

-      doc.root << relation.to_xml_node
+      doc.root << relation.to_xml_node if relation.visible

     end
 
     render :text => doc.to_s, :content_type => "text/xml"
     end
 
     render :text => doc.to_s, :content_type => "text/xml"