X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3d6e1c67fb2291c6933f37bac3b9a3f518e8487a..dc2a95903722644f6109244cec9a2d1e195fef0e:/app/controllers/changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 19d1591a0..a24f61e28 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -2,6 +2,7 @@
 
 class ChangesetController < ApplicationController
   require 'xml/libxml'
+  require 'diff_reader'
 
   before_filter :authorize, :only => [:create, :update, :delete, :upload]
   before_filter :check_write_availability, :only => [:create, :update, :delete, :upload]
@@ -35,80 +36,73 @@ class ChangesetController < ApplicationController
   end
 
   def fix_way(w, node_ids)
-    w.nds.each { |nd|
-      new_id = node_ids[nd.node_id]
-      nd.node_id = new_id unless new_id.nil?
-    }
+    w.nds = w.instance_eval { @nds }.
+      map { |nd| node_ids[nd] || nd }
+    return w
   end
 
   def fix_rel(r, ids)
-    r.members.each { |memb|
-      new_id = ids[memb.member_type][memb.member_id]
-      nd.member_id = new_id unless new_id.nil?
-    }
+    r.members = r.instance_eval { @members }.
+      map { |memb| [memb[0], ids[memb[0]][memb[1].to_i] || memb[1], memb[2]] }
+    return r
+  end
+  
+  def read
+    begin
+      changeset = Changeset.find(params[:id])
+      render :text => changeset.to_xml.to_s, :content_type => "text/xml"
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
+  
+  def close 
+    begin
+      unless request.put?
+        render :nothing => true, :status => :method_not_allowed
+        return
+      end
+      changeset = Changeset.find(params[:id])
+      changeset.open = false
+      changeset.save!
+      render :nothing => true
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
   end
 
+  ##
+  # Upload a diff in a single transaction.
+  #
+  # This means that each change within the diff must succeed, i.e: that
+  # each version number mentioned is still current. Otherwise the entire
+  # transaction *must* be rolled back.
+  #
+  # Furthermore, each element in the diff can only reference the current
+  # changeset.
+  #
+  # Returns: ??? the new document? updated diffs?
   def upload
-    if not request.put?
+    # only allow POST requests, as the upload method is most definitely
+    # not idempotent, as several uploads with placeholder IDs will have
+    # different side-effects.
+    # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.2
+    unless request.post?
       render :nothing => true, :status => :method_not_allowed
       return
     end
 
-    # FIXME: this should really be done without loading the whole XML file
-    # into memory.
-    p = XML::Parser.new
-    p.string  = request.raw_post
-    doc = p.parse
-
-    node_ids, way_ids, rel_ids = {}, {}, {}
-    ids = {"node"=>node_ids, "way"=>way_ids, "relation"=>rel_ids}
-
+    changeset = Changeset.find(params[:id])
+    
+    diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
-      doc.find('//osm/create/node').each do |nd|
-	create_prim node_ids, Node.from_xml_node(nd, true), nd
-      end
-      doc.find('//osm/create/way').each do |nd|
-	way = Way.from_xml_node(nd, true)
-	raise OSM::APIPreconditionFailedError.new if !way.preconditions_ok?
-	create_prim way_ids, fix_way(way, node_ids), nd
-      end
-      doc.find('//osm/create/relation').each do |nd|
-	relation = Relation.from_xml_node(nd, true)
-	raise OSM::APIPreconditionFailedError.new if !way.preconditions_ok?
-	create_prim relation_ids, fix_rel(relation, ids), nd
-      end
-
-      doc.find('//osm/modify/node').each do |nd|
-	unless NodeController.update_internal nil, Node.from_xml_node(nd)
-	  raise OSM::APIPreconditionFailedError.new
-	end
-      end
-      doc.find('//osm/modify/way').each do |nd|
-	unless WayController.update_internal nil, fix_way(Way.from_xml_node(nd), node_ids)
-	  raise OSM::APIPreconditionFailedError.new
-	end
-      end
-      doc.find('//osm/modify/relation').each do |nd|
-	unless RelationController.update_internal nil, fix_rel(Relation.from_xml_node(nd), ids)
-	  raise OSM::APIPreconditionFailedError.new
-	end
-      end
-
-      doc.find('//osm/delete/node').each do |nd|
-	unless NodeController.delete_internal nil, Node.from_xml_node(n)
-	  raise OSM::APIPreconditionFailedError.new
-	end
-      end
-      doc.find('//osm/delete/way').each do |nd|
-	Way.from_xml_node(nd).delete_with_relations_and_history(@user)
-      end
-      doc.find('//osm/delete/relation').each do |nd|
-	unless RelationController.delete_internal nil, fix_rel(Relation.from_xml_node(nd), ids)
-	  raise OSM::APIPreconditionFailedError.new
-	end
-      end
+      result = diff_reader.commit
+      render :text => result.to_s, :content_type => "text/xml"
     end
-
-    render :text => "Ok, Fine. Upload worked without errors.\n", :status => 200
+    
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true, :status => :not_found
+  rescue OSM::APIError => ex
+    render ex.render_opts
   end
 end