gpx import now fully works

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index f74b1d0091c3d4c06093135a18d14acec903df33..aa68d9b9408616784ccf8f60b70573f8f9cdc6cb 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,6 +1,10 @@
 class Trace < ActiveRecord::Base
   set_table_name 'gpx_files'
 
+  validates_presence_of :user_id, :name, :public, :description, :timestamp
+#  validates_numericality_of :latitude, :longitude
+  validates_inclusion_of :inserted, :in => [ true, false]
+  
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :destroy
 
@@ -10,44 +14,44 @@ class Trace < ActiveRecord::Base
       tt.tag = tag
       tt
     }
-  end\r
-  \r
-  def large_picture= (data)\r
-    f = File.new(large_picture_name, "wb")\r
-    f.syswrite(data)\r
-    f.close\r
-  end\r
-  \r
-  def icon_picture= (data)\r
-    f = File.new(icon_picture_name, "wb")\r
-    f.syswrite(data)\r
-    f.close\r
-  end\r
-\r
-  def large_picture\r
-    f = File.new(large_picture_name, "rb")\r
-    logger.info "large picture file: '#{f.path}', bytes: #{File.size(f.path)}"\r
-    data = f.sysread(File.size(f.path))\r
-    logger.info "have read data, bytes: '#{data.length}'"\r
-    f.close\r
-    data\r
-  end\r
-  \r
-  def icon_picture\r
-    f = File.new(icon_picture_name, "rb")\r
-    logger.info "icon picture file: '#{f.path}'"\r
-    data = f.sysread(File.size(f.path))\r
-    f.close\r
-    data\r
-  end\r
-  \r
-  # FIXME change to permanent filestore area\r
-  def large_picture_name\r
-    "/tmp/#{id}.gif"\r
-  end\r
-\r
-  # FIXME change to permanent filestore area\r
-  def icon_picture_name\r
-    "/tmp/#{id}_icon.gif"\r
-  end\r
+  end
+  
+  def large_picture= (data)
+    f = File.new(large_picture_name, "wb")
+    f.syswrite(data)
+    f.close
+  end
+  
+  def icon_picture= (data)
+    f = File.new(icon_picture_name, "wb")
+    f.syswrite(data)
+    f.close
+  end
+
+  def large_picture
+    f = File.new(large_picture_name, "rb")
+    logger.info "large picture file: '#{f.path}', bytes: #{File.size(f.path)}"
+    data = f.sysread(File.size(f.path))
+    logger.info "have read data, bytes: '#{data.length}'"
+    f.close
+    data
+  end
+  
+  def icon_picture
+    f = File.new(icon_picture_name, "rb")
+    logger.info "icon picture file: '#{f.path}'"
+    data = f.sysread(File.size(f.path))
+    f.close
+    data
+  end
+  
+  # FIXME change to permanent filestore area
+  def large_picture_name
+    "/tmp/#{id}.gif"
+  end
+
+  # FIXME change to permanent filestore area
+  def icon_picture_name
+    "/tmp/#{id}_icon.gif"
+  end
 end