lib/sushi_fabric/sushiApp.rb in sushi_fabric-1.2.2 vs lib/sushi_fabric/sushiApp.rb in sushi_fabric-1.2.3
- old
+ new
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
# encoding: utf-8
-# Version = '20230623-165238'
+# Version = '20230623-175030'
require 'csv'
require 'fileutils'
require 'yaml'
require 'drb/drb'
@@ -347,11 +347,13 @@
false
end
end
def check_application_parameters
if @required_params and (@required_params - @params.keys).empty?
- @output_params = {"sushi_app" => self.class.name}.merge(@params.clone)
+ # PD, 20230623, the following fix changed parameters.tsv info, and reverted
+ #@output_params = {"sushi_app" => self.class.name}.merge(@params.clone)
+ @output_params = @params.clone
end
end
def set_user_parameters
# this should be done in an instance of applicaiton subclass
if @parameterset_tsv_file
@@ -586,9 +588,10 @@
@next_dataset_tsv_path = File.join(@gstore_result_dir, @next_dataset_file)
end
def save_parameters_as_tsv
file_path = File.join(@scratch_result_dir, @parameter_file)
CSV.open(file_path, 'w', :col_sep=>"\t") do |out|
+ out << ["sushi_app", self.class.name]
@output_params.each do |key, value|
if @output_params[key, 'file_upload'] and !value.to_s.empty?
uploaded_file_path = File.join(@result_dir, "uploaded", File.basename(value))
out << [key, uploaded_file_path]
@params[key] = uploaded_file_path