From eafabe2b9273bb677867f89f04a9962a4567dcf1 Mon Sep 17 00:00:00 2001 From: Pierre Rioux Date: Tue, 13 Aug 2024 12:05:17 -0400 Subject: [PATCH] Adjusted BACs slightly --- BrainPortal/app/models/background_activity.rb | 2 +- .../app/models/background_activity/register_and_copy_file.rb | 3 ++- .../app/models/background_activity/register_and_move_file.rb | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BrainPortal/app/models/background_activity.rb b/BrainPortal/app/models/background_activity.rb index 469df1f25..4cef0a918 100644 --- a/BrainPortal/app/models/background_activity.rb +++ b/BrainPortal/app/models/background_activity.rb @@ -733,7 +733,7 @@ def record_in_rails_log #:nodoc: if File.directory?(Rails.root + "data_dumps/bacs") username = self.user.login File.open(Rails.root + "data_dumps/bacs/#{username}.jsonl","a") do |fh| - fh.write(json_text + "\n") + fh.write(json_text + "\n") end end diff --git a/BrainPortal/app/models/background_activity/register_and_copy_file.rb b/BrainPortal/app/models/background_activity/register_and_copy_file.rb index 7c2f38c30..6b8aed1eb 100644 --- a/BrainPortal/app/models/background_activity/register_and_copy_file.rb +++ b/BrainPortal/app/models/background_activity/register_and_copy_file.rb @@ -52,7 +52,8 @@ def process(item) # item is like "TextFile-abcd.xyz" dest_dp = DataProvider.find(dest_dp_id) newfile = userfile.provider_copy_to_otherprovider(dest_dp) userfile.unregister # we leave the original content on the DP, but not registered. - [ true, newfile.id ] + return [ true, newfile.id ] if newfile.is_a?(Userfile) + return [ false, "Copy failed" ] # when provider_copy returns false end end diff --git a/BrainPortal/app/models/background_activity/register_and_move_file.rb b/BrainPortal/app/models/background_activity/register_and_move_file.rb index 7fc1adab2..f6f8aa798 100644 --- a/BrainPortal/app/models/background_activity/register_and_move_file.rb +++ b/BrainPortal/app/models/background_activity/register_and_move_file.rb @@ -50,8 +50,9 @@ def process(item) # item is like "TextFile-abcd.xyz" dest_dp_id = self.options[:dest_data_provider_id] userfile = Userfile.find(userfile_id) dest_dp = DataProvider.find(dest_dp_id) - userfile.provider_move_to_otherprovider(dest_dp) - [ true, userfile.id ] + move_ok = userfile.provider_move_to_otherprovider(dest_dp) + return [ true, userfile.id ] if move_ok + return [ false, "Registered but cannot be moved" ] end end