intial commit, for 'en' locale only, for changeset_comment_notification only, doesn...

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index a1e98467648507fef371d1c827a03a67526696ca..47e5c38b7ee79be23de54384a73b11d0bf881006 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -174,7 +174,7 @@ class Trace < ActiveRecord::Base
 
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create = false)
 
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create = false)

-    p = XML::Parser.string(xml)
+    p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR)

     doc = p.parse
 
     doc.find("//osm/gpx_file").each do |pt|
     doc = p.parse
 
     doc.find("//osm/gpx_file").each do |pt|


@@ -197,7 +197,7 @@ class Trace < ActiveRecord::Base
       trace.id = pt["id"].to_i
       # .to_i will return 0 if there is no number that can be parsed.
       # We want to make sure that there is no id with zero anyway
       trace.id = pt["id"].to_i
       # .to_i will return 0 if there is no number that can be parsed.
       # We want to make sure that there is no id with zero anyway

-      raise OSM::APIBadUserInput.new("ID of trace cannot be zero when updating.") if trace.id == 0
+      raise OSM::APIBadUserInput.new("ID of trace cannot be zero when updating.") if trace.id.zero?

     end
 
     # We don't care about the time, as it is explicitly set on create/update/delete
     end
 
     # We don't care about the time, as it is explicitly set on create/update/delete