various gpx bits

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 0b39d52ce8b8def2d51b00494bfa4bb054309ac5..337f27e0e80c32164f8d0790e4a6062c3833574a 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -11,15 +11,20 @@ class TraceController < ApplicationController
   end
 
   def create
+    filename = "/tmp/#{rand}"
+
+    File.open(filename, "w") { |f| f.write(@params['trace']['gpx_file'].read) }
     @params['trace']['name'] = @params['trace']['gpx_file'].original_filename.gsub(/[^a-zA-Z0-9.]/, '_') # This makes sure filenames are sane
-    @params['trace']['data'] = @params['trace']['gpx_file'].read
-    @params['trace']['mime_type'] = @params['trace']['gpx_file'].content_type.chomp
+    #@params['trace']['data'] = @params['trace']['gpx_file'].read
+#    @params['trace']['mime_type'] = @params['trace']['gpx_file'].content_type.chomp
     @params['trace'].delete('gpx_file') # let's remove the field from the hash, because there's no such field in the DB anyway.
     @trace = Trace.new(@params['trace'])
     @trace.inserted = false
     @trace.user_id = @user.id
     @trace.timestamp = Time.now
     if @trace.save
+      logger.info("id is #{@trace.id}")
+      `mv #{filename} /tmp/#{@trace.id}.gpx`
       flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     end
 

diff --git a/app/controllers/trace_points_controller.rb b/app/controllers/trace_points_controller.rb
deleted file mode 100644 (file)
index be34cd2..0000000
--- a/app/controllers/trace_points_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class TracePointsController < ApplicationController
-end

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 451067b21fe53255507ebcc1093b7afb74019a39..014db4ae2640057ff146bf943f4a32ebcf83a04c 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -4,6 +4,8 @@ class Trace < ActiveRecord::Base
   belongs_to :user
 
   def tags=(bleh)
+  end
 
+  def mime_type=(bleh)
   end
 end

diff --git a/app/models/trace_points.rb b/app/models/trace_points.rb
deleted file mode 100644 (file)
index 56703a2..0000000
--- a/app/models/trace_points.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class TracePoints < ActiveRecord::Base
-  set_table_name 'gps_points'
-  belongs_to :trace, :foreign_key => 'gpx_id'
-end

diff --git a/db/migrate.sql b/db/migrate.sql
index 4638ba5a11b0aca294cbfc0b62678b3437b8e072..0bf3c3a909d770072386629fe730ee42fab6de5d 100644 (file)
--- a/db/migrate.sql
+++ b/db/migrate.sql
@@ -15,9 +15,6 @@ alter table current_ways modify id bigint(64) not null auto_increment, add prima
 alter table current_way_tags change k k varchar(255) not null default '';
 alter table current_way_tags change v v varchar(255) not null default '';
 
-alter table gpx_files add column data longblob;
-alter table gpx_files add column mime_type varchar(255);
 alter table gpx_files change private public boolean default 1 not null;
 update gpx_files set public = !public;
 
-