From 74332693fed1d5ecb695dd6ae0c2fc611d14c4d7 Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Fri, 9 Aug 2019 12:28:19 +0000
Subject: do not delete batch tr_dataset if one of model tr_dataset;error
 message if dataset has no compounds

---
 application.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application.rb')

diff --git a/application.rb b/application.rb
index 246efe1..064c488 100644
--- a/application.rb
+++ b/application.rb
@@ -184,7 +184,7 @@ post '/predict/?' do
       raise "Wrong file extension for '#{params[:fileselect][:filename]}'. Please upload a CSV file."
     end
     @filename = params[:fileselect][:filename]
-    File.open('tmp/' + params[:fileselect][:filename], "w") do |f|
+    File.open('tmp/' + @filename, "w") do |f|
       f.write(params[:fileselect][:tempfile].read)
     end
     # check CSV structure by parsing and header check
@@ -198,6 +198,7 @@ post '/predict/?' do
 
   unless params[:batchfile].blank?
     dataset = Dataset.from_csv_file File.join("tmp", params[:batchfile])
+    raise "No compounds in Dataset. Please read the <a href='https://dg.in-silico.ch/predict/help' rel='external'> HELP </a> page." if dataset.compounds.size == 0
     response['Content-Type'] = "application/json"
     return {:dataset_id => dataset.id.to_s, :models => params[:models]}.to_json
   end
@@ -233,7 +234,6 @@ post '/predict/?' do
     maintask[:subTasks] = @tasks.collect{|t| t.id}
     maintask.save
     @pid = maintask.pid
-    File.delete File.join(dataset.source)
     response['Content-Type'] = "text/html"
     return haml :batch
   else
-- 
cgit v1.2.3