Shut up libxml's "Must specify a string with one or more characters" error on relatio...

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 6be1061591dda7b665b20ceed5b5b81ae79e96d3..c3769b14d68e2a126d2f54002e746127bc61d80d 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -27,14 +27,13 @@ class Relation < ActiveRecord::Base
 
   def self.from_xml(xml, create=false)
     begin
 
   def self.from_xml(xml, create=false)
     begin

-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)

       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
         return Relation.from_xml_node(pt, create)
       end
       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
         return Relation.from_xml_node(pt, create)
       end

-    rescue LibXML::XML::Error => ex
+    rescue LibXML::XML::Error, ArgumentError => ex

       raise OSM::APIBadXMLError.new("relation", xml, ex.message)
     end
   end
       raise OSM::APIBadXMLError.new("relation", xml, ex.message)
     end
   end