More work on export tab.

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 3c6ef8ee020a202de70740b0d34b771407e50b3d..2b1ba6c753c70df6579d381facebc7bd451be754 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -31,7 +31,7 @@ class RelationController < ApplicationController
   def read
     begin
       relation = Relation.find(params[:id])
   def read
     begin
       relation = Relation.find(params[:id])

-
+      response.headers['Last-Modified'] = relation.timestamp.rfc822

       if relation.visible
         render :text => relation.to_xml.to_s, :content_type => "text/xml"
       else
       if relation.visible
         render :text => relation.to_xml.to_s, :content_type => "text/xml"
       else


@@ -47,27 +47,22 @@ class RelationController < ApplicationController
   def update
     begin
       relation = Relation.find(params[:id])
   def update
     begin
       relation = Relation.find(params[:id])

+      new_relation = Relation.from_xml(request.raw_post)

 
 

-      if relation.visible
-        new_relation = Relation.from_xml(request.raw_post)
-
-        if new_relation and new_relation.id == relation.id
-          if !new_relation.preconditions_ok?
-            render :text => "", :status => :precondition_failed
-          else
-            relation.user_id = @user.id
-            relation.tags = new_relation.tags
-            relation.members = new_relation.members
-            relation.visible = true
-            relation.save_with_history!
-
-            render :nothing => true
-          end
+      if new_relation and new_relation.id == relation.id
+        if !new_relation.preconditions_ok?
+          render :text => "", :status => :precondition_failed

         else
         else

-          render :nothing => true, :status => :bad_request
+          relation.user_id = @user.id
+          relation.tags = new_relation.tags
+          relation.members = new_relation.members
+          relation.visible = true
+          relation.save_with_history!
+
+          render :nothing => true

         end
       else
         end
       else

-        render :text => "", :status => :gone
+        render :nothing => true, :status => :bad_request

       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found


@@ -206,16 +201,12 @@ class RelationController < ApplicationController
   def relations_for_object(objtype)
     relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
 
   def relations_for_object(objtype)
     relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq
 

-    if relationids.length > 0
-      doc = OSM::API.new.get_xml_doc
-
-      Relation.find(relationids).each do |relation|
-        doc.root << relation.to_xml_node
-      end
+    doc = OSM::API.new.get_xml_doc

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :not_found
+    Relation.find(relationids).each do |relation|
+      doc.root << relation.to_xml_node

     end
     end

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

   end
 end
   end
 end