from_xml sets a version on nodes

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index b239dd405bbe4e1846b14053719b0b4b3ad9fd1b..d7b9de13cb6589cad3589e68396648ca7193b001 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -13,8 +13,9 @@ class RelationController < ApplicationController
 
       if relation
         if !relation.preconditions_ok?
 
       if relation
         if !relation.preconditions_ok?

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

         else
         else

+         relation.version = 0

           relation.user_id = @user.id
           relation.save_with_history!
 
           relation.user_id = @user.id
           relation.save_with_history!
 


@@ -31,11 +32,11 @@ 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

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

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


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

-
-      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 :nothing => true, :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
-        else
-          render :nothing => true, :status => :bad_request
-        end
+      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
+        render :text => relation.version.to_s, :content_type => "text/plain"

       else
       else

-        render :nothing => true, :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

+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed

     rescue
       render :nothing => true, :status => :internal_server_error
     end
     rescue
       render :nothing => true, :status => :internal_server_error
     end


@@ -80,22 +73,11 @@ 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])

-
-      if relation.visible
-        if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]])
-          render :nothing => true, :status => :precondition_failed
-        else
-          relation.user_id = @user.id
-          relation.tags = []
-          relation.members = []
-          relation.visible = false
-          relation.save_with_history!
-
-          render :nothing => true
-        end
-      else
-        render :nothing => true, :status => :gone
-      end
+      relation.delete_with_history(@user)
+    rescue OSM::APIAlreadyDeletedError
+      render :text => "", :status => :gone
+    rescue OSM::APIPreconditionFailedError
+      render :text => "", :status => :precondition_failed

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


@@ -166,7 +148,7 @@ class RelationController < ApplicationController
 
       else
 
 
       else
 

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

       end
 
     rescue ActiveRecord::RecordNotFound
       end
 
     rescue ActiveRecord::RecordNotFound


@@ -206,16 +188,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