lib/sushi_fabric/sushiApp.rb in sushi_fabric-0.2.5 vs lib/sushi_fabric/sushiApp.rb in sushi_fabric-0.2.7

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20140701-154826'
+# Version = '20141009-103900'
 
 require 'csv'
 require 'fileutils'
 require 'yaml'
 require 'drb/drb'
@@ -127,10 +127,11 @@
 end
 def save_data_set(data_set_arr, headers, rows)
   data_set_hash = Hash[*data_set_arr]
   if project = Project.find_by_number(data_set_hash['ProjectNumber'].to_i)
     data_set = DataSet.new
+    #data_set.user = user
     data_set.name = data_set_hash['DataSetName']
     data_set.project = project
     if parent_id = data_set_hash['ParentID'] and parent_data_set = DataSet.find_by_id(parent_id.to_i)
       data_set.data_set = parent_data_set
     end
@@ -156,10 +157,11 @@
       data_set.save
     end
     data_set.id
   end
 end
+#module_function :save_data_set
 
 class SushiApp
   attr_reader :params
   attr_reader :job_ids
   attr_reader :next_dataset_id
@@ -468,13 +470,16 @@
     make_job_script
     @job_scripts << @job_script
     @result_dataset << next_dataset
   end
   def save_data_set(data_set_arr, headers, rows)
+    #SushiFabric.save_data_set(data_set_arr, headers, rows, user)
+#=begin
     data_set_hash = Hash[*data_set_arr]
     if project = Project.find_by_number(data_set_hash['ProjectNumber'].to_i)
       data_set = DataSet.new
+      #data_set.user = user
       data_set.name = data_set_hash['DataSetName']
       data_set.project = project
       if parent_id = data_set_hash['ParentID'] and parent_data_set = DataSet.find_by_id(parent_id.to_i)
         data_set.data_set = parent_data_set
       end
@@ -499,10 +504,11 @@
         parent_data_set.data_sets << data_set if parent_data_set
         data_set.save
       end
       data_set.id
     end
+#=end
   end
   def run
     test_run
 
     ## the user presses RUN
@@ -561,9 +567,10 @@
           else
             rows << row
           end
         end
         unless NO_ROR
+          #@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)
 
           # save job and dataset relation in Sushi DB
           job_ids.each do |job_id|
             new_job = Job.new