c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fix importer

Browse Source
This commit is contained in:
Lee Lawlor 2015-03-30 09:56:17 -04:00
parent a5871fabf6
commit e27fd396ff
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/channels_controller.rb
View File

@ -517,6 +517,14 @@ class ChannelsController < ApplicationController
if !row.blank? if !row.blank?
feed = Feed.new feed = Feed.new
# set location and status then delete the rows
# these 5 deletes must be performed in the proper (reverse) order
feed.status = row.delete_at(status_column) if status_column > 0
feed.location = row.delete_at(location_column) if location_column > 0
feed.elevation = row.delete_at(elevation_column) if elevation_column > 0
feed.longitude = row.delete_at(longitude_column) if longitude_column > 0
feed.latitude = row.delete_at(latitude_column) if latitude_column > 0
# add the fields if they are from named columns, using reverse order # add the fields if they are from named columns, using reverse order
feed.field8 = row.delete_at(field8_column) if field8_column != -1 feed.field8 = row.delete_at(field8_column) if field8_column != -1
feed.field7 = row.delete_at(field7_column) if field7_column != -1 feed.field7 = row.delete_at(field7_column) if field7_column != -1
@ -527,14 +535,6 @@ class ChannelsController < ApplicationController
feed.field2 = row.delete_at(field2_column) if field2_column != -1 feed.field2 = row.delete_at(field2_column) if field2_column != -1
feed.field1 = row.delete_at(field1_column) if field1_column != -1 feed.field1 = row.delete_at(field1_column) if field1_column != -1
# set location and status then delete the rows
# these 5 deletes must be performed in the proper (reverse) order
feed.status = row.delete_at(status_column) if status_column > 0
feed.location = row.delete_at(location_column) if location_column > 0
feed.elevation = row.delete_at(elevation_column) if elevation_column > 0
feed.longitude = row.delete_at(longitude_column) if longitude_column > 0
feed.latitude = row.delete_at(latitude_column) if latitude_column > 0
# remove entry_id column if necessary # remove entry_id column if necessary
row.delete_at(entry_id_column) if entry_id_column > 0 row.delete_at(entry_id_column) if entry_id_column > 0
@ -556,6 +556,10 @@ class ChannelsController < ApplicationController
feed.field6 = row[6] if feed.field6.blank? feed.field6 = row[6] if feed.field6.blank?
feed.field7 = row[7] if feed.field7.blank? feed.field7 = row[7] if feed.field7.blank?
feed.field8 = row[8] if feed.field8.blank? feed.field8 = row[8] if feed.field8.blank?
feed.latitude = row[9] if feed.latitude.blank?
feed.longitude = row[10] if feed.longitude.blank?
feed.elevation = row[11] if feed.elevation.blank?
feed.status = row[12] if feed.status.blank?
# save channel and feed # save channel and feed
feed.save feed.save
@ -614,4 +618,3 @@ class ChannelsController < ApplicationController
end end
end end