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

- old
+ new

@@ -1,8 +1,8 @@ #!/usr/bin/env ruby # encoding: utf-8 -# Version = '20170302-092829' +# Version = '20170302-093250' require 'csv' require 'fileutils' require 'yaml' require 'drb/drb' @@ -200,11 +200,11 @@ attr_accessor :dataset_name attr_accessor :next_dataset_comment attr_accessor :workflow_manager attr_accessor :current_user attr_accessor :logger - attr_accessor :bfabric_registration + attr_accessor :off_bfabric_registration def initialize @gstore_dir = GSTORE_DIR @project = nil @name = nil @params = {} @@ -246,12 +246,14 @@ end end unless NO_ROR @current_user ||= nil @dataset_sushi_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user) - dataset = DataSet.find_by_id(@dataset_sushi_id.to_i) - dataset.register_bfabric + unless @off_bfabric_registration + dataset = DataSet.find_by_id(@dataset_sushi_id.to_i) + dataset.register_bfabric + end end elsif @dataset_sushi_id @dataset_hash = [] @dataset = [] if dataset = DataSet.find_by_id(@dataset_sushi_id.to_i) @@ -702,11 +704,13 @@ end unless NO_ROR @current_user ||= nil @next_dataset_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user) - next_dataset = DataSet.find_by_id(@next_dataset_id) - next_dataset.register_bfabric + unless @off_bfabric_registration + next_dataset = DataSet.find_by_id(@next_dataset_id) + next_dataset.register_bfabric + end # save job and dataset relation in Sushi DB job_ids.each do |job_id| new_job = Job.new new_job.submit_job_id = job_id.to_i