lib/sushi_fabric/sushiApp.rb in sushi_fabric-0.6.9 vs lib/sushi_fabric/sushiApp.rb in sushi_fabric-0.7.0

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20170302-093250'
+# Version = '20170303-140449'
 
 require 'csv'
 require 'fileutils'
 require 'yaml'
 require 'drb/drb'
@@ -247,12 +247,13 @@
       end
       unless NO_ROR
         @current_user ||= nil
         @dataset_sushi_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user)
         unless @off_bfabric_registration
-          dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
-          dataset.register_bfabric
+          if dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
+            dataset.register_bfabric
+          end
         end
       end
     elsif @dataset_sushi_id
       @dataset_hash = []
       @dataset = []
@@ -705,11 +706,12 @@
       unless NO_ROR
         @current_user ||= nil
         @next_dataset_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user)
 
         unless @off_bfabric_registration
-          next_dataset = DataSet.find_by_id(@next_dataset_id)
-          next_dataset.register_bfabric
+          if next_dataset = DataSet.find_by_id(@next_dataset_id)
+            next_dataset.register_bfabric
+          end
         end
 
         # save job and dataset relation in Sushi DB
         job_ids.each do |job_id|
           new_job = Job.new