halts (partially) substituted by OpenTox errors

4 files changed, 10 insertions, 10 deletions

diff --git a/fminer.rb b/fminer.rb
index 00d11a0..ee031ff 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -94,11 +94,11 @@ end
 # @return [text/uri-list] Task URI
 post '/fminer/bbrc/?' do 
 
-  halt 404, "Please submit a dataset_uri." unless params[:dataset_uri] and  !params[:dataset_uri].nil?
-  halt 404, "Please submit a prediction_feature." unless params[:prediction_feature] and  !params[:prediction_feature].nil?
+  raise OpenTox::NotFoundError.new "Please submit a dataset_uri." unless params[:dataset_uri] and  !params[:dataset_uri].nil?
+  raise OpenTox::NotFoundError.new "Please submit a prediction_feature." unless params[:prediction_feature] and  !params[:prediction_feature].nil?
   prediction_feature = OpenTox::Feature.find params[:prediction_feature], @subjectid
   training_dataset = OpenTox::Dataset.find "#{params[:dataset_uri]}", @subjectid
-  halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature])
+  raise OpenTox::NotFoundError.new "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature])
 
   unless params[:min_frequency].nil? 
     minfreq=params[:min_frequency].to_i
@@ -268,7 +268,7 @@ post '/fminer/bbrc/?' do
     feature_dataset.uri
   end
   response['Content-Type'] = 'text/uri-list'
-  halt 503,task.uri+"\n" if task.status == "Cancelled"
+  raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled"
   halt 202,task.uri.to_s+"\n"
 end
 #end
@@ -284,12 +284,12 @@ end
 # @return [text/uri-list] Task URI
 post '/fminer/last/?' do
 
-  halt 404, "Please submit a dataset_uri." unless params[:dataset_uri] and  !params[:dataset_uri].nil?
-  halt 404, "Please submit a prediction_feature." unless params[:prediction_feature] and  !params[:prediction_feature].nil?
+  raise OpenTox::NotFoundError.new "Please submit a dataset_uri." unless params[:dataset_uri] and  !params[:dataset_uri].nil?
+  raise OpenTox::NotFoundError.new "Please submit a prediction_feature." unless params[:prediction_feature] and  !params[:prediction_feature].nil?
   prediction_feature = OpenTox::Feature.find params[:prediction_feature], @subjectid
   training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}", @subjectid
   training_dataset.load_all(@subjectid)
-  halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature])
+  raise OpenTox::NotFoundError.new "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature])
 
   unless params[:min_frequency].nil? 
     minfreq=params[:min_frequency].to_i
@@ -430,6 +430,6 @@ post '/fminer/last/?' do
     feature_dataset.uri
   end
   response['Content-Type'] = 'text/uri-list'
-  halt 503,task.uri+"\n" if task.status == "Cancelled"
+  raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled"
   halt 202,task.uri.to_s+"\n"
 end
diff --git a/last-utils b/last-utils
-Subproject 75bea7645601fd296aa68c6678ee9b0a49a7b91
+Subproject 04bd1b73f54bb7422d3c08bb5a81bc02af04f6f
diff --git a/lazar.rb b/lazar.rb
index 00f3216..4441726 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -191,7 +191,7 @@ post '/lazar/?' do
     model_uri
 	end
   response['Content-Type'] = 'text/uri-list' 
-  halt 503,task.uri+"\n" if task.status == "Cancelled"
+  raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled"
   halt 202,task.uri
 end
 
diff --git a/openbabel.rb b/openbabel.rb
index fedcb8a..463663e 100644
--- a/openbabel.rb
+++ b/openbabel.rb
@@ -143,6 +143,6 @@ post '/openbabel' do
     result_dataset.uri
   end
   response['Content-Type'] = 'text/uri-list'
-  halt 503,task.uri+"\n" if task.status == "Cancelled"
+  raise OpenTox::ServiceUnavailableError.newtask.uri+"\n" if task.status == "Cancelled"
   halt 202,task.uri.to_s+"\n"
 end