X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c54471ee33f79b7119eb284b03a845813a058876..0272d30b9683fb3a4bb6b63940373b17a5c6cf60:/lib/diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 3b13e9462..37de8ea59 100644
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -47,7 +47,7 @@ class DiffReader
       # read the first element
       read_or_die
 
-      begin
+      while @reader.node_type != 15 do # end element
         # because we read elements in DOM-style to reuse their DOM
         # parsing code, we don't always read an element on each pass
         # as the call to @reader.next in the innermost loop will take
@@ -57,7 +57,7 @@ class DiffReader
         else
           read_or_die
         end
-      end while @reader.node_type != 15 # end element
+      end 
     end
     read_or_die
   end
@@ -179,14 +179,23 @@ class DiffReader
         # delete action. this takes a payload in API 0.6, so we need to do
         # most of the same checks that are done for the modify.
         with_model do |model, xml|
-          new = model.from_xml_node(xml, false)
-          check(model, xml, new)
+          # delete doesn't have to contain a full payload, according to
+          # the wiki docs, so we just extract the things we need.
+          new_id = xml['id'].to_i
+          raise API::APIBadXMLError.new(model, xml, "ID attribute is required") if new_id.nil?
 
           # if the ID is a placeholder then map it to the real ID
           model_sym = model.to_s.downcase.to_sym
-          is_placeholder = ids[model_sym].include? new.id
-          id = is_placeholder ? ids[model_sym][new.id] : new.id
+          is_placeholder = ids[model_sym].include? new_id
+          id = is_placeholder ? ids[model_sym][new_id] : new_id
 
+          # build the "new" element by modifying the existing one
+          new = model.find(id)
+          new.changeset_id = xml['changeset'].to_i
+          new.version = xml['version'].to_i
+          check(model, xml, new)
+
+          # fetch the matching old element from the DB
           old = model.find(id)
 
           # can a delete have placeholders under any circumstances?
@@ -197,7 +206,7 @@ class DiffReader
           xml_result = XML::Node.new model.to_s.downcase
           # oh, the irony... the "new" element actually contains the "old" ID
           # a better name would have been client/server, but anyway...
-          xml_result["old_id"] = new.id.to_s
+          xml_result["old_id"] = new_id.to_s
           result.root << xml_result
         end