fix problematic merge

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index de9bda661f10c0034bd3444e99465064c5cf9a1d..92cc39678d767b32e209d96a86fd254063be75af 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,13 +1,25 @@
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 

-  validates_presence_of :user_id, :name, :public, :description, :timestamp
+  validates_presence_of :user_id, :name, :timestamp
+  validates_presence_of :description, :on => :create

 #  validates_numericality_of :latitude, :longitude
 #  validates_numericality_of :latitude, :longitude

-  validates_inclusion_of :inserted, :in => [ true, false]
+  validates_inclusion_of :public, :inserted, :in => [ true, false]

   
   belongs_to :user
   
   belongs_to :user

-  has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :destroy
-  has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :destroy
+  has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
+  has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all
+
+  def destroy
+    super
+    FileUtils.rm_f(trace_name)
+    FileUtils.rm_f(icon_picture_name)
+    FileUtils.rm_f(large_picture_name)
+  end
+
+  def tagstring
+    return tags.collect {|tt| tt.tag}.join(" ")
+  end

 
   def tagstring=(s)
     self.tags = s.split().collect {|tag|
 
   def tagstring=(s)
     self.tags = s.split().collect {|tag|


@@ -60,6 +72,16 @@ class Trace < ActiveRecord::Base
     "/home/osm/gpx/#{id}.gpx"
   end
 
     "/home/osm/gpx/#{id}.gpx"
   end
 

+  def mime_type
+    return `file -bi #{trace_name}`.chomp
+  end
+
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+

   def to_xml_node
     el1 = XML::Node.new 'gpx_file'
     el1['id'] = self.id.to_s
   def to_xml_node
     el1 = XML::Node.new 'gpx_file'
     el1['id'] = self.id.to_s


@@ -78,13 +100,27 @@ 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'
       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 -b #{trace_name}`.chomp
-      gzipped = filetype =~ /^gzip/
-      zipped = filetype =~ /^Zip/
+      filetype = `file -bz #{trace_name}`.chomp
+      gzipped = filetype =~ /gzip compressed/
+      bzipped = filetype =~ /bzip2 compressed/
+      zipped = filetype =~ /Zip archive/
+      tarred = filetype =~ /tar archive/

 
 

-      if gzipped
+      if tarred and gzipped then
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -zxOf #{trace_name} > #{filename}")
+      elsif tarred and bzipped then
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -jxOf #{trace_name} > #{filename}")
+      elsif tarred
+        filename = tempfile = "/tmp/#{rand}"
+        system("tar -xOf #{trace_name} > #{filename}")
+      elsif gzipped

         filename = tempfile = "/tmp/#{rand}"
         system("gunzip -c #{trace_name} > #{filename}")
         filename = tempfile = "/tmp/#{rand}"
         system("gunzip -c #{trace_name} > #{filename}")

+      elsif bzipped
+        filename = tempfile = "/tmp/#{rand}"
+        system("bunzip2 -c #{trace_name} > #{filename}")

       elsif zipped
         filename = tempfile = "/tmp/#{rand}"
         system("unzip -p #{trace_name} > #{filename}")
       elsif zipped
         filename = tempfile = "/tmp/#{rand}"
         system("unzip -p #{trace_name} > #{filename}")


@@ -135,21 +171,11 @@ class Trace < ActiveRecord::Base
         self.size = gpx.actual_points
         self.inserted = true
         self.save
         self.size = gpx.actual_points
         self.inserted = true
         self.save

-
-        Notifier::deliver_gpx_success(self, gpx.possible_points)
-      else
-        FileUtils.rm_f("/home/osm/gpx/#{id}.gpx")
-        self.destroy
-        Notifier::deliver_gpx_failure(self, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?')

       end
 
       logger.info "done trace #{id}"
       end
 
       logger.info "done trace #{id}"

-    rescue Exception => ex
-      logger.info ex
-      ex.backtrace.each {|l| logger.info l }
-      FileUtils.rm_f("/home/osm/gpx/#{id}.gpx")
-      self.destroy
-      Notifier::deliver_gpx_failure(self, ex.to_s + ex.backtrace.join("\n") )
+
+      return gpx

     ensure
       FileUtils.rm_f(tempfile) if tempfile
     end
     ensure
       FileUtils.rm_f(tempfile) if tempfile
     end