X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/16358a1d39d96a2d04ab410731c9edcdf155606b..d3b42fef34849eafb281512fc8794d8bfb138719:/app/models/trace.rb diff --git a/app/models/trace.rb b/app/models/trace.rb index ed0ba72e8..c189c035e 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -73,7 +73,7 @@ class Trace < ActiveRecord::Base end def mime_type - filetype = `file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -bz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ @@ -92,7 +92,7 @@ class Trace < ActiveRecord::Base end def extension_name - filetype = `file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -bz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ @@ -141,7 +141,7 @@ class Trace < ActiveRecord::Base logger.info("GPX Import importing #{name} (#{id}) from #{user.email}") # TODO *nix specific, could do to work on windows... would be functionally inferior though - check for '.gz' - filetype = `file -bz #{trace_name}`.chomp + filetype = `/usr/bin/file -bz #{trace_name}`.chomp gzipped = filetype =~ /gzip compressed/ bzipped = filetype =~ /bzip2 compressed/ zipped = filetype =~ /Zip archive/ @@ -188,7 +188,6 @@ class Trace < ActiveRecord::Base tp.lng = point['longitude'].to_f tp.altitude = point['altitude'].to_f tp.timestamp = point['timestamp'] - tp.user_id = user.id tp.gpx_id = id tp.trackid = point['segment'].to_i tp.save! @@ -211,7 +210,7 @@ class Trace < ActiveRecord::Base self.icon_picture = gpx.get_icon(min_lat, min_lon, max_lat, max_lon) self.size = gpx.actual_points self.inserted = true - self.save + self.save! end logger.info "done trace #{id}"