Actually set the instance var when closing the changeset

[rails.git] / app / models / relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 19548f20ceed02e0d1c62f8afbff51ee53f353c7..ba27e9d7d6efb179e60446343ada1bb130898185 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -35,7 +35,6 @@ class Relation < ActiveRecord::Base
         return Relation.from_xml_node(pt, create)
       end
     rescue LibXML::XML::Error => ex
-      #return nil
       raise OSM::APIBadXMLError.new("relation", xml, ex.message)
     end
   end
@@ -47,16 +46,18 @@ class Relation < ActiveRecord::Base
       relation.id = pt['id'].to_i
     end
 
-    relation.version = pt['version']
+    raise OSM::APIBadXMLError.new("relation", pt, "You are missing the required changeset in the relation") if pt['changeset'].nil?
     relation.changeset_id = pt['changeset']
 
     if create
       relation.timestamp = Time.now
       relation.visible = true
+      relation.version = 0
     else
       if pt['timestamp']
         relation.timestamp = Time.parse(pt['timestamp'])
       end
+      relation.version = pt['version']
     end
 
     pt.find('tag').each do |tag|
@@ -208,7 +209,7 @@ class Relation < ActiveRecord::Base
 
     # duplicate tags are now forbidden, so we can't allow values
     # in the hash to be overwritten.
-    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+    raise OSM::APIDuplicateTagsError.new("relation", self.id, k) if @tags.include? k
 
     @tags[k] = v
   end
@@ -346,19 +347,24 @@ class Relation < ActiveRecord::Base
   end    
 
   def delete_with_history!(new_relation, user)
-    if self.visible
+    unless self.visible
+      raise OSM::APIAlreadyDeletedError.new
+    end
+
+    # need to start the transaction here, so that the database can 
+    # provide repeatable reads for the used-by checks. this means it
+    # shouldn't be possible to get race conditions.
+    Relation.transaction do
       check_consistency(self, new_relation, user)
+      # This will check to see if this relation is used by another relation
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = ? AND member_type='relation' and member_id=? ", true, self.id ])
-        raise OSM::APIPreconditionFailedError.new
-      else
-        self.changeset_id = new_relation.changeset_id
-        self.tags = {}
-        self.members = []
-        self.visible = false
-        save_with_history!
+        raise OSM::APIPreconditionFailedError.new("The relation #{new_relation.id} is a used in another relation")
       end
-    else
-      raise OSM::APIAlreadyDeletedError.new
+      self.changeset_id = new_relation.changeset_id
+      self.tags = {}
+      self.members = []
+      self.visible = false
+      save_with_history!
     end
   end