lib/sushi_fabric/sushiApp.rb in sushi_fabric-0.8.7 vs lib/sushi_fabric/sushiApp.rb in sushi_fabric-0.8.8
- old
+ new
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
# encoding: utf-8
-# Version = '20180412-093456'
+# Version = '20180615-110546'
require 'csv'
require 'fileutils'
require 'yaml'
require 'drb/drb'
@@ -660,11 +660,11 @@
make_job_script('append')
@result_dataset << next_dataset
end
@job_scripts << @job_script
end
- def save_data_set(data_set_arr, headers, rows, user=nil)
+ def save_data_set(data_set_arr, headers, rows, user=nil, child=nil)
data_set_hash = Hash[*data_set_arr]
unless project = Project.find_by_number(data_set_hash['ProjectNumber'].to_i)
project = Project.new
project.number = data_set_hash['ProjectNumber'].to_i
project.save
@@ -696,10 +696,14 @@
sample.key_value = sample_hash.to_s
sample.save unless sample.saved?
data_set.samples << sample
end
+ if child
+ data_set.child = true
+ end
+
data_set.md5 = data_set.md5hexdigest
unless data_set.saved?
project.data_sets << data_set
parent_data_set.data_sets << data_set if parent_data_set
data_set.save
@@ -770,10 +774,10 @@
rows << row
end
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_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user, @child)
unless @off_bfabric_registration
if next_dataset = DataSet.find_by_id(@next_dataset_id)
next_dataset.register_bfabric
end