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

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# Version = '20170303-140449'
+# Version = '20170303-160743'
 
 require 'csv'
 require 'fileutils'
 require 'yaml'
 require 'drb/drb'
@@ -172,10 +172,12 @@
       data_set.save
       if user
         user.data_sets << data_set
         user.save
       end
+    else
+      headers[0] = DataSet.find_by_md5(data_set.md5)
     end
     data_set.id
   end
 end
 #module_function :save_data_set
@@ -245,15 +247,18 @@
           rows << row
         end
       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
-          if dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
-            dataset.register_bfabric
+        if @dataset_sushi_id = save_data_set(data_set_arr.to_a.flatten, headers, rows, @current_user)
+          unless @off_bfabric_registration
+            if dataset = DataSet.find_by_id(@dataset_sushi_id.to_i)
+              dataset.register_bfabric
+            end
           end
+        elsif data_set = headers[0] and data_set.instance_of?(DataSet)
+          @dataset_sushi_id = data_set.id
         end
       end
     elsif @dataset_sushi_id
       @dataset_hash = []
       @dataset = []
@@ -645,9 +650,11 @@
         data_set.save
         if user
           user.data_sets << data_set
           user.save
         end
+      else
+        headers[0] = DataSet.find_by_md5(data_set.md5)
       end
       data_set.id
     end
   end
   def main