app/models/import.rb in reso-0.1.4.8 vs app/models/import.rb in reso-0.1.4.9
- old
+ new
@@ -40,14 +40,15 @@
end
end
def run_import
if self.status == 'active'
+ self.update_attribute(:status, :running)
if self.new_source_data_exists?
- self.update_attribute(:status, :running)
source_data_modified = self.source_url_last_modified
+ self.update_attribute(:source_data_modified, source_data_modified)
l, count, found_listing_keys, snapshots, stream = 0, 0, [], [], ''
open_tag, close_tag = get_open_and_closing_tag_for self.repeating_element
# Grab a file to work with
@@ -72,22 +73,18 @@
end
end
end
end_time = Time.now
removed_listing_keys = self.remove_listings_not_present(found_listing_keys)
- self.assign_attributes({
- status: :active,
- source_data_modified: source_data_modified
- })
- self.save
import_result.assign_attributes({
end_time: end_time,
found_listing_keys: found_listing_keys,
removed_listing_keys: removed_listing_keys.inspect
})
import_result.save
File.delete(filepath)
end
+ self.update_attribute(:status, :active)
end
end
def download_feed_to_import import
filename = [Time.now.to_s.parameterize, import.source_url.split('/').last].join