Throw errors in the way xml parsing if there is a problem. Bring the way parsing...

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 3b13e94626cc301f941a103a8df812a1b7fc831a..0b159315830e25a6eb6c56c98c2295fbcac3ee36 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -18,7 +18,7 @@ class DiffReader
   # in OsmChange format. All diffs must be limited to a single changeset
   # given in +changeset+.
   def initialize(data, changeset)
   # in OsmChange format. All diffs must be limited to a single changeset
   # given in +changeset+.
   def initialize(data, changeset)

-    @reader = XML::Reader.new data
+    @reader = XML::Reader.string(data)

     @changeset = changeset
   end
 
     @changeset = changeset
   end
 


@@ -26,11 +26,12 @@ class DiffReader
   # Reads the next element from the XML document. Checks the return value
   # and throws an exception if an error occurred.
   def read_or_die
   # Reads the next element from the XML document. Checks the return value
   # and throws an exception if an error occurred.
   def read_or_die

-    # NOTE: XML::Reader#read returns 0 for EOF and -1 for error.
-    # we allow an EOF because we are expecting this to always happen
-    # at the end of a document.
-    if @reader.read < 0
-      raise APIBadUserInput.new("Unexpected end of XML document.")
+    # NOTE: XML::Reader#read returns false for EOF and raises an
+    # exception if an error occurs.
+    begin
+      @reader.read
+    rescue LibXML::XML::Error => ex
+      raise OSM::APIBadXMLError.new("changeset", xml, ex.message)

     end
   end
 
     end
   end
 


@@ -47,7 +48,7 @@ class DiffReader
       # read the first element
       read_or_die
 
       # 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
         # 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 +58,7 @@ class DiffReader
         else
           read_or_die
         end
         else
           read_or_die
         end

-      end while @reader.node_type != 15 # end element
+      end 

     end
     read_or_die
   end
     end
     read_or_die
   end


@@ -71,8 +72,8 @@ class DiffReader
   def with_model
     with_element do |model_name|
       model = MODELS[model_name]
   def with_model
     with_element do |model_name|
       model = MODELS[model_name]

-      raise "Unexpected element type #{model_name}, " +
-        "expected node, way, relation." if model.nil?
+      raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " +
+                                     "expected node, way or relation.") if model.nil?

       yield model, @reader.expand
       @reader.next
     end
       yield model, @reader.expand
       @reader.next
     end


@@ -129,7 +130,7 @@ class DiffReader
 
           # some elements may have placeholders for other elements in the
           # diff, so we must fix these before saving the element.
 
           # some elements may have placeholders for other elements in the
           # diff, so we must fix these before saving the element.

-          new.fix_placeholders!(ids)
+          new.fix_placeholders!(ids, placeholder_id)

 
           # create element given user
           new.create_with_history(@changeset.user)
 
           # create element given user
           new.create_with_history(@changeset.user)


@@ -155,19 +156,21 @@ class DiffReader
 
           # if the ID is a placeholder then map it to the real ID
           model_sym = model.to_s.downcase.to_sym
 
           # 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
+          client_id = new.id
+          is_placeholder = ids[model_sym].include? client_id
+          id = is_placeholder ? ids[model_sym][client_id] : client_id

 
           # and the old one from the database
           old = model.find(id)
 
 
           # and the old one from the database
           old = model.find(id)
 

+          # translate any placeholder IDs to their true IDs.

           new.fix_placeholders!(ids)
           new.fix_placeholders!(ids)

+          new.id = id
+

           old.update_from(new, @changeset.user)
 
           xml_result = XML::Node.new model.to_s.downcase
           old.update_from(new, @changeset.user)
 
           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"] = client_id.to_s

           xml_result["new_id"] = id.to_s 
           # version is updated in "old" through the update, so we must not
           # return new.version here but old.version!
           xml_result["new_id"] = id.to_s 
           # version is updated in "old" through the update, so we must not
           # return new.version here but old.version!


@@ -179,14 +182,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|
         # 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
 
           # 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?
           old = model.find(id)
 
           # can a delete have placeholders under any circumstances?


@@ -197,7 +209,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 = 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
 
           result.root << xml_result
         end